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

feat(api,dal): удалена старая таблица Works. Переделаны запросы в API из в Works в Jobs

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-09 16:00:38 +10:00
parent 362da02233
commit b033f95116
22 changed files with 4035 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
PARR.API/Contracts/V1/ApiRoutes.cs
View File

@@ -353,7 +353,7 @@ namespace PARR.API.Contracts.V1
public const string GetAll = Base + "/tnks/";
public const string Get = Base + "/tnks/" + getParam;
public const string GetWorks = Base + "/tnks/" + getParam + "/works";
public const string GetJobs = Base + "/tnks/" + getParam + "/jobs";
public const string Delete = Base + "/tnks/" + getParam;
public const string Create = Base + "/tnks/";
@@ -362,16 +362,16 @@ namespace PARR.API.Contracts.V1
public const string getParam = "{id}";
}
public static class Work
{
public const string GetAll = Base + "/works/";
public const string Get = Base + "/works/" + getParam;
public const string Delete = Base + "/works/" + getParam;
public const string Create = Base + "/works/";
public const string Update = Base + "/works/" + getParam;
//public static class Work
//{
// public const string GetAll = Base + "/works/";
// public const string Get = Base + "/works/" + getParam;
// public const string Delete = Base + "/works/" + getParam;
// public const string Create = Base + "/works/";
// public const string Update = Base + "/works/" + getParam;
public const string getParam = "{id}";
}
// public const string getParam = "{id}";
//}
#endregion

5
PARR.API/Contracts/V1/Requests/Queries/JobQuery.cs
View File

@@ -13,5 +13,10 @@ namespace PARR.API.Contracts.V1.Requests.Queries
/// Поиск по Id группы работ
/// </summary>
public Guid? GroupId { get; set; }
/// <summary>
/// Поиск по Id ТНК
/// </summary>
public Guid? TnkId { get; set; }
}
}

2
PARR.API/Contracts/V1/Responses/ApplicationInWorkResponse.cs
View File

@@ -30,7 +30,7 @@
public string? AgentScript { get; set; }
public WorkResponse? Work { get; set; }
//public WorkResponse? Work { get; set; }
public int TemplatesCount { get; set; }

22
PARR.API/Contracts/V1/Responses/WorkResponse.cs
View File

@@ -1,22 +0,0 @@
namespace PARR.API.Contracts.V1.Responses
{
public class WorkResponse
{
public Guid Id { get; set; }
public required string Name { get; set; }
public required string TemplateNameMask { get; set; }
public string? TemplateSuffix { get; set; }
public int EsppId { get; set; }
public Guid TnkId { get; set; }
}
public class WorkWithTnkResponse : WorkResponse
{
public TnkWithSubprocessResponse? Tnk { get; set; }
}
}

4
PARR.API/Controllers/V1/JobController.cs
View File

@@ -92,6 +92,10 @@ namespace PARR.API.Controllers.V1
if (filter.GroupId.HasValue)
query = query.Where(t => t.GroupId == filter.GroupId.Value);
if (filter.TnkId.HasValue)
query = query.Where(t => t.TnkId == filter.TnkId.Value);
if (filter.IsFull)
{
query = query

1
PARR.API/Controllers/V1/TemplateSyncStateController.cs
View File

@@ -1,5 +1,4 @@
using AutoMapper;
using InfluxDB.Client.Api.Domain;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;

14
PARR.API/Controllers/V1/TnkController.cs
View File

@@ -102,19 +102,19 @@ namespace PARR.API.Controllers.V1
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Tnk.GetWorks)]
[HttpGet(ApiRoutes.Tnk.GetJobs)]
public async Task<IActionResult> Get([FromRoute] Guid id)
{
var tnk = await tnkService.Get()
.Include(w => w.Works)
.Include(w => w.Jobs)
.FirstOrDefaultAsync(t => t.Id == id);
if (tnk == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не найдена ТНК с id: {id}" } }));
var response = mapper.Map<List<WorkResponse>>(tnk.Works.OrderBy(t => t.Name).ToList());
var response = mapper.Map<List<JobBaseResponse>>(tnk.Jobs.OrderBy(t => t.Name).ToList());
return Ok(new Response<List<WorkResponse>>(response, true));
return Ok(new Response<List<JobBaseResponse>>(response, true));
}
@@ -206,13 +206,13 @@ namespace PARR.API.Controllers.V1
[HttpDelete(ApiRoutes.Tnk.Delete)]
public async Task<IActionResult> Delete([FromRoute] Guid id)
{
var tnk = await tnkService.Get().Include(t => t.Works).FirstOrDefaultAsync(t => t.Id == id);
var tnk = await tnkService.Get().Include(t => t.Jobs).FirstOrDefaultAsync(t => t.Id == id);
if (tnk == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК." } }));
if (tnk.Works.Any())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК. У данного ТНК есть работы ({tnk.Works.Count()} шт.)" } }));
if (tnk.Jobs.Any())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК. У данного ТНК есть работы ({tnk.Jobs.Count()} шт.)" } }));
if (!tnkService.Delete(tnk) || !await tnkService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК." } }));

223
PARR.API/Controllers/V1/WorkController.cs
View File

@@ -1,223 +0,0 @@
using AutoMapper;
using FluentValidation;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests;
using PARR.API.Contracts.V1.Requests.Queries;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.API.Extensions;
using PARR.API.Services.Interfaces;
using PARR.Constants;
using PARR.DAL.DomainModels;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1
{
/// <summary>
/// Управление работами
/// </summary>
[Authorize(Roles = ParrRoles.Administrator.Role)]
public class WorkController : BaseApiController
{
private readonly ILogger<WorkController> logger;
private readonly IMapper mapper;
private readonly IWorkService workService;
private readonly IValidator<WorkRequest> validator;
private readonly IUriService uriService;
public WorkController(
ILogger<WorkController> logger,
IMapper mapper,
IWorkService workService,
IValidator<WorkRequest> validator,
IUriService uriService
)
{
this.logger = logger;
this.mapper = mapper;
this.workService = workService;
this.validator = validator;
this.uriService = uriService;
}
/// <summary>
/// Список видов работ постранично
/// </summary>
/// <param name="paginationQuery"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Work.GetAll)]
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] WorkGetAllQuery filter)
{
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
IQueryable<Work> query = workService.Get()
.OrderBy(t => t.Name);
if (filter.AllParents)
query = query.Include(t => t.Tnk).ThenInclude(s => s.Subprocess).ThenInclude(p => p.Process);
if (!string.IsNullOrWhiteSpace(filter.Name))
query = query.Where(t => t.Name.ToLower().Contains(filter.Name.ToLower()));
if (filter.Id.HasValue)
query = query.Where(t => t.Id == filter.Id);
if (filter.TnkId.HasValue)
query = query.Where(t => t.TnkId == filter.TnkId.Value);
var works = await workService.GetPage(query, paginationFilter).ToListAsync();
if (!works.Any())
return NoContent();
if (filter.AllParents)
{
//todo: тут бесконечность в маппинге
// респонс с иерархией вверх до процесса
var allResponse = mapper.Map<List<WorkWithTnkResponse>>(works);
var paginationAllResponse = new PagedResponse<WorkWithTnkResponse>(allResponse, true).GetPaginatedProps(paginationFilter, query);
return Ok(paginationAllResponse);
}
var workResponse = mapper.Map<List<WorkResponse>>(works);
var paginationResponse = new PagedResponse<WorkResponse>(workResponse, true).GetPaginatedProps(paginationFilter, query);
return Ok(paginationResponse);
}
/// <summary>
/// Получить работу по id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Work.Get)]
public async Task<IActionResult> GetById([FromRoute] Guid id)
{
var work = await workService.Get()
.FirstOrDefaultAsync(t => t.Id == id);
if (work == null)
return NotFound();
var response = mapper.Map<WorkResponse>(work);
return Ok(new Response<WorkResponse>(response, true));
}
/// <summary>
/// Создать вид работы
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpPost(ApiRoutes.Work.Create)]
public async Task<IActionResult> Create([FromBody] WorkRequest request)
{
var resultValidate = await validator.ValidateAsync(request);
if (!resultValidate.IsValid)
return BadRequest(new Response(resultValidate.Errors));
var existName = await workService.Get().FirstOrDefaultAsync(t => t.Name.ToLower() == request.Name.Trim().ToLower());
if (existName != null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.Name), Message = $"Вид работы с именем \"{request.Name}\" уже существует." } }));
var existEsppId = await workService.Get().FirstOrDefaultAsync(t => t.EsppId == request.EsppId);
if (existEsppId != null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.EsppId), Message = $"Вид работы с EsppId: {request.EsppId} уже существует." } }));
var work = new Work
{
Id = Guid.NewGuid(),
Name = request.Name.Trim(),
TemplateNameMask = request.TemplateNameMask,
EsppId = request.EsppId,
TnkId = request.TnkId,
TemplateSuffix = request.TemplateSuffix
};
if (!await workService.CreateAsync(work) || !await workService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при создании вида работ." } }));
logger.LogInformation($"Пользователь {User.Identity?.Name} добавил вид работ: {work.Name}, {work.EsppId}, {work.TnkId}");
var locationUri = uriService.GetUri(ApiRoutes.Work.Get, ApiRoutes.Work.getParam, work.Id);
return Created(locationUri, new Response<WorkResponse>(mapper.Map<WorkResponse>(work), true));
}
/// <summary>
/// Обновить вид работ
/// </summary>
/// <param name="id"></param>
/// <param name="request"></param>
/// <returns></returns>
[HttpPut(ApiRoutes.Work.Update)]
public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] WorkRequest request)
{
var resultValidate = await validator.ValidateAsync(request);
if (!resultValidate.IsValid)
return BadRequest(new Response(resultValidate.Errors));
//проверка на уникальность esppId
var existEsppId = await workService.Get().FirstOrDefaultAsync(t => t.Id != id && t.EsppId == request.EsppId);
if (existEsppId != null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(request.EsppId), Message = $"Уже есть вид работ с EsppId: {request.EsppId}" } }));
var orig = await workService.Get()
.FirstOrDefaultAsync(t => t.Id == id);
if (orig == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении вида работ. Не найдена работа Id: {id}" } }));
orig.Name = request.Name.Trim();
orig.TemplateNameMask = request.TemplateNameMask.Trim();
orig.EsppId = request.EsppId;
orig.TnkId = request.TnkId;
orig.DateModified = DateTimeOffset.UtcNow;
orig.TemplateSuffix = request.TemplateSuffix;
if (!await workService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка записи в базу данных изменений вида работ." } }));
logger.LogInformation($"Пользователь {User.Identity?.Name} обновил работу: {orig.Id}, {orig.Name}, {orig.EsppId}, {orig.TnkId}");
return Ok(new Response<WorkResponse>(mapper.Map<WorkResponse>(orig), true));
}
/// <summary>
/// Удалить вид работ (если у него нет заданий (AppInWork))
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete(ApiRoutes.Work.Delete)]
public async Task<IActionResult> Delete([FromRoute] Guid id)
{
var work = await workService.Get().Include(t => t.ApplicationsInWorks).FirstOrDefaultAsync(t => t.Id == id);
if (work == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении вида работ." } }));
if (work.ApplicationsInWorks.Any())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении вида работ. У данной работы есть задания ({work.ApplicationsInWorks.Count()} шт.)" } }));
if (!workService.Delete(work) || !await workService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении вида работ." } }));
logger.LogInformation($"Пользователь {User.Identity?.Name} удалил вид работ: {work.Id}, {work.Name}, {work.EsppId}, {work.TnkId}");
return NoContent();
}
}
}

6
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -78,10 +78,10 @@ namespace PARR.API.MappingProfiles
CreateMap<Tnk, TnkWithSubprocessResponse>();
CreateMap<Work, WorkResponse>()
.Include<Work, WorkWithTnkResponse>();
//CreateMap<Work, WorkResponse>()
// .Include<Work, WorkWithTnkResponse>();
CreateMap<Work, WorkWithTnkResponse>();
//CreateMap<Work, WorkWithTnkResponse>();
#endregion

9
PARR.API/Validators/ApplicationInWorkValidator.cs
View File

@@ -9,21 +9,18 @@ namespace PARR.API.Validators
public class ApplicationInWorkValidator : AbstractValidator<ApplicationInWorkRequest>
{
private readonly IApplicationsInWorkService applicationsInWorkService;
private readonly IWorkService workService;
private readonly IEsppSchTypeConfigService esppSchTypeConfigService;
private readonly IWorkGroupService workGroupService;
private readonly IEsppSchTypeValueService esppSchTypeValueService;
public ApplicationInWorkValidator(
IApplicationsInWorkService applicationsInWorkService,
IWorkService workService,
IEsppSchTypeConfigService esppSchTypeConfigService,
IWorkGroupService workGroupService,
IEsppSchTypeValueService esppSchTypeValueService
)
{
this.applicationsInWorkService = applicationsInWorkService;
this.workService = workService;
this.esppSchTypeConfigService = esppSchTypeConfigService;
this.workGroupService = workGroupService;
this.esppSchTypeValueService = esppSchTypeValueService;
@@ -187,13 +184,15 @@ namespace PARR.API.Validators
private async Task<bool> IsWorkExist(ApplicationInWorkRequest request)
{
return await workService.GetAsync(request.WorkId) != null;
//return await workService.GetAsync(request.WorkId) != null;
return true;
}
private async Task<bool> IsApplicationExist(ApplicationInWorkRequest request)
{
return await workService.GetAsync(request.WorkId) != null;
//return await workService.GetAsync(request.WorkId) != null;
return true;
}

1
PARR.DAL/Context/DataContext.cs
View File

@@ -31,7 +31,6 @@ namespace PARR.DAL.Context
public DbSet<Process> Processes { get; set; }
public DbSet<Subprocess> Subprocesses { get; set; }
public DbSet<Tnk> Tnks { get; set; }
public DbSet<Work> Works { get; set; }
public DbSet<ApplicationsInWork> ApplicationsInWorks { get; set; }

3869
PARR.DAL/Migrations/20251209055614_removeWorks.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

69
PARR.DAL/Migrations/20251209055614_removeWorks.cs Normal file
View File

@@ -0,0 +1,69 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class removeWorks : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_ApplicationsInWorks_Works_WorkId",
table: "ApplicationsInWorks");
migrationBuilder.DropTable(
name: "Works");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "Works",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
TnkId = table.Column<Guid>(type: "uuid", nullable: false),
DateCreated = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
DateModified = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true),
EsppId = table.Column<int>(type: "integer", nullable: false),
Name = table.Column<string>(type: "text", nullable: false),
TemplateNameMask = table.Column<string>(type: "text", nullable: false),
TemplateSuffix = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Works", x => x.Id);
table.ForeignKey(
name: "FK_Works_Tnks_TnkId",
column: x => x.TnkId,
principalTable: "Tnks",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_Works_EsppId",
table: "Works",
column: "EsppId",
unique: true);
migrationBuilder.CreateIndex(
name: "IX_Works_TnkId",
table: "Works",
column: "TnkId");
migrationBuilder.AddForeignKey(
name: "FK_ApplicationsInWorks_Works_WorkId",
table: "ApplicationsInWorks",
column: "WorkId",
principalTable: "Works",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

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

@@ -3065,45 +3065,6 @@ namespace PARR.DAL.Migrations
b.ToTable("WeekendDays");
});
modelBuilder.Entity("PARR.DAL.Models.Work", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<DateTimeOffset>("DateCreated")
.HasColumnType("timestamp with time zone");
b.Property<DateTimeOffset?>("DateModified")
.HasColumnType("timestamp with time zone");
b.Property<int>("EsppId")
.HasColumnType("integer");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.Property<string>("TemplateNameMask")
.IsRequired()
.HasColumnType("text");
b.Property<string>("TemplateSuffix")
.HasColumnType("text");
b.Property<Guid>("TnkId")
.HasColumnType("uuid");
b.HasKey("Id");
b.HasIndex("EsppId")
.IsUnique();
b.HasIndex("TnkId");
b.ToTable("Works");
});
modelBuilder.Entity("PARR.DAL.Models.WorkGroup", b =>
{
b.Property<Guid>("Id")
@@ -3209,15 +3170,7 @@ namespace PARR.DAL.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PARR.DAL.Models.Work", "Work")
.WithMany("ApplicationsInWorks")
.HasForeignKey("WorkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Application");
b.Navigation("Work");
});
modelBuilder.Entity("PARR.DAL.Models.DistributionPeriod", b =>
@@ -3328,7 +3281,7 @@ namespace PARR.DAL.Migrations
.IsRequired();
b.HasOne("PARR.DAL.Models.Tnk", "Tnk")
.WithMany()
.WithMany("Jobs")
.HasForeignKey("TnkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
@@ -3676,17 +3629,6 @@ namespace PARR.DAL.Migrations
b.Navigation("User");
});
modelBuilder.Entity("PARR.DAL.Models.Work", b =>
{
b.HasOne("PARR.DAL.Models.Tnk", "Tnk")
.WithMany("Works")
.HasForeignKey("TnkId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("Tnk");
});
modelBuilder.Entity("PARR.DAL.Models.WorkGroup", b =>
{
b.HasOne("PARR.DAL.Models.ResponseArea", "ResponseArea")
@@ -3871,7 +3813,7 @@ namespace PARR.DAL.Migrations
modelBuilder.Entity("PARR.DAL.Models.Tnk", b =>
{
b.Navigation("Works");
b.Navigation("Jobs");
});
modelBuilder.Entity("PARR.DAL.Models.Unit.Unit", b =>
@@ -3912,11 +3854,6 @@ namespace PARR.DAL.Migrations
b.Navigation("Roles");
});
modelBuilder.Entity("PARR.DAL.Models.Work", b =>
{
b.Navigation("ApplicationsInWorks");
});
modelBuilder.Entity("PARR.DAL.Models.WorkGroup", b =>
{
b.Navigation("AppInWorks");

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

@@ -105,8 +105,8 @@ namespace PARR.DAL.Models
/// </summary>
public string? AgentScript { get; set; }
[ForeignKey(nameof(WorkId))]
public Work? Work { get; set; }
//[ForeignKey(nameof(WorkId))]
//public Work? Work { get; set; }
[ForeignKey(nameof(ApplicationId))]
public Application? Application { get; set; }

3
PARR.DAL/Models/Tnk.cs
View File

@@ -29,6 +29,7 @@ namespace PARR.DAL.Models
[ForeignKey(nameof(SubprocessId))]
public Subprocess? Subprocess { get; set; }
public ICollection<Work> Works { get; set; } = new HashSet<Work>();
public ICollection<Job.Job> Jobs { get; set; } = new HashSet<Job.Job>();
}
}

40
PARR.DAL/Models/Work.cs
View File

@@ -1,40 +0,0 @@
using Microsoft.EntityFrameworkCore;
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("Works")]
[Index(nameof(EsppId), IsUnique = true)]
public class Work : IBase
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; }
public required string Name { get; set; }
/// <summary>
/// Маска для динамического формирования имени шаблона
/// </summary>
public required string TemplateNameMask { get; set; }
/// <summary>
/// Короткое имя, для формирования имени шаблона
/// </summary>
public string? TemplateSuffix { get; set; }
public int EsppId { get; set; }
public Guid TnkId { get; set; }
[ForeignKey(nameof(TnkId))]
public Tnk? Tnk { get; set; }
public ICollection<ApplicationsInWork> ApplicationsInWorks { get; set; } = new HashSet<ApplicationsInWork>();
}
}

1
PARR.DAL/ParrDalInstaller.cs
View File

@@ -65,7 +65,6 @@ namespace PARR.DAL
services.AddTransient<IApplicationTypeService, ApplicationTypeService>();
services.AddTransient<IApplicationInHostService, ApplicationInHostService>();
services.AddTransient<IApplicationsInWorkService, ApplicationsInWorkService>();
services.AddTransient<IWorkService, WorkService>();
services.AddTransient<IApplicationService, ApplicationService>();
services.AddTransient<IProcessService, ProcessService>();
services.AddTransient<ISubprocessService, SubprocessService>();

25
PARR.DAL/Services/Implementations/WorkService.cs
View File

@@ -1,25 +0,0 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models;
using PARR.DAL.Services.Abstracts;
using PARR.DAL.Services.Interfaces;
namespace PARR.DAL.Services.Implementations
{
internal class WorkService : BaseService<Work>, IWorkService
{
private readonly DataContext dataContext;
private readonly ILogger<WorkService> logger;
public WorkService(DataContext dataContext, ILogger<WorkService> logger) : base(logger)
{
this.dataContext = dataContext;
this.logger = logger;
}
protected override DbSet<Work> EntitySet => dataContext.Works;
protected override DataContext EntitiContext => dataContext;
}
}

9
PARR.DAL/Services/Interfaces/IWorkService.cs
View File

@@ -1,9 +0,0 @@
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces.Base;
namespace PARR.DAL.Services.Interfaces
{
public interface IWorkService : IBaseService<Work>
{
}
}

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

@@ -203,42 +203,42 @@ namespace PARR.GeneratorTemplates.Services
{
var templates = new List<Template>();
foreach (var host in hosts)
{
var appInWork = host.ApplicationsInHosts.FirstOrDefault(t => t.ApplicationId == query.ApplicationId)?.Application?.ApplicationsInWorks.FirstOrDefault(a => a.WorkId == query.WorkId);
//foreach (var host in hosts)
//{
// var appInWork = host.ApplicationsInHosts.FirstOrDefault(t => t.ApplicationId == query.ApplicationId)?.Application?.ApplicationsInWorks.FirstOrDefault(a => a.WorkId == query.WorkId);
if (appInWork == null)
{
// такого не может быть, так как выполнился запрос при получении списка хостов, но мало ли
logger.LogError($"Ошибка при создании шаблона. В таблице ApplicationsInWorks не найден Id согласно запроса WorkId: {query.WorkId}, ApplicationId: {query.ApplicationId}");
//return;
return templates;
}
// if (appInWork == null)
// {
// // такого не может быть, так как выполнился запрос при получении списка хостов, но мало ли
// logger.LogError($"Ошибка при создании шаблона. В таблице ApplicationsInWorks не найден Id согласно запроса WorkId: {query.WorkId}, ApplicationId: {query.ApplicationId}");
// //return;
// return templates;
// }
var template = new Template
{
Id = Guid.NewGuid(),
//Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name),
//Генерить имя с полным именем работы и подстановкой ЭК
//Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.ShortcodeEnum.EK, host.Ek)),
//Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет
Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(
host.ResponseArea!.Name,
settingsFromDb.TemplatePrefixName,
host.Ek,
appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name
),
IsActiveTemplate = query.IsActiveTemplate ?? false,
IsActiveSchedule = query.IsActiveSchedule ?? false,
JobId = appInWork.Id,//TODO Migratin to Job
UnitId = host.Id,//TODO Migratin to Job
// NextRun не задаем значение, его рассчитаем позже
//NextRun = ???,
LastRun = null
};
// var template = new Template
// {
// Id = Guid.NewGuid(),
// //Name = TemplateHelpers.GenerateTemplateName("ЗО" ,settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name),
// //Генерить имя с полным именем работы и подстановкой ЭК
// //Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(host.ResponseArea!.Name, settingsFromDb.TemplatePrefixName, host.Ek, appInWork.Work!.Name.ApplyShortcode(Constants.Shortcode.ShortcodeEnum.EK, host.Ek)),
// //Вместо полного имени работы, подставляется сокращенный суффикс или полное имя с ЭК если суффикса нет
// Name = TemplateHelpers.GenerateTemplateNameWithResponseArea(
// host.ResponseArea!.Name,
// settingsFromDb.TemplatePrefixName,
// host.Ek,
// appInWork.Work!.TemplateSuffix ?? appInWork.Work!.Name
// ),
// IsActiveTemplate = query.IsActiveTemplate ?? false,
// IsActiveSchedule = query.IsActiveSchedule ?? false,
// JobId = appInWork.Id,//TODO Migratin to Job
// UnitId = host.Id,//TODO Migratin to Job
// // NextRun не задаем значение, его рассчитаем позже
// //NextRun = ???,
// LastRun = null
// };
templates.Add(template);
}
// templates.Add(template);
//}
return templates;
}

48
PARR.MockData/Services/TemplatesInitializer.cs
View File

@@ -12,15 +12,15 @@ namespace PARR.MockData.Services
private readonly IProcessService processService;
private readonly ISubprocessService subprocessService;
private readonly ITnkService tnkService;
private readonly IWorkService workService;
//private readonly IWorkService workService;
public TemplatesInitializer(
ILogger<TemplatesInitializer> logger,
ITemplateService templateService,
IProcessService processService,
ISubprocessService subprocessService,
ITnkService tnkService,
IWorkService workService
ITnkService tnkService
//IWorkService workService
)
{
this.logger = logger;
@@ -28,7 +28,7 @@ namespace PARR.MockData.Services
this.processService = processService;
this.subprocessService = subprocessService;
this.tnkService = tnkService;
this.workService = workService;
//this.workService = workService;
}
public async Task InitAsync()
{
@@ -91,26 +91,26 @@ namespace PARR.MockData.Services
logger.LogInformation($"----- Создан tnk: {tnk.Name} -----");
}
var work = await workService.Get().FirstOrDefaultAsync(p => p.EsppId == 292917);
if (work == null)
{
work = new Work
{
Id = Guid.NewGuid(),
DateCreated = DateTimeOffset.UtcNow,
Name = "Прочее(работы)",
EsppId = 292917,
TnkId = tnk.Id,
TemplateNameMask= "%ЗО%-ЭИТИ-ПТК-ПАРР__%ЭК%__%РАБОТА%"
};
if (!await workService.CreateAsync(work) || !await workService.CommitAsync())
{
logger.LogError($"Не удалось создать work {work.Name}");
return;
}
else
logger.LogInformation($"----- Создан work: {work.Name} -----");
}
//var work = await workService.Get().FirstOrDefaultAsync(p => p.EsppId == 292917);
//if (work == null)
//{
// work = new Work
// {
// Id = Guid.NewGuid(),
// DateCreated = DateTimeOffset.UtcNow,
// Name = "Прочее(работы)",
// EsppId = 292917,
// TnkId = tnk.Id,
// TemplateNameMask= "%ЗО%-ЭИТИ-ПТК-ПАРР__%ЭК%__%РАБОТА%"
// };
// if (!await workService.CreateAsync(work) || !await workService.CommitAsync())
// {
// logger.LogError($"Не удалось создать work {work.Name}");
// return;
// }
// else
// logger.LogInformation($"----- Создан work: {work.Name} -----");
//}
}
}