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

Merge branch 'dev' of http://gitlab.dvgd.oao.rzd/devptk/parr/parr_api into dev

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2023-09-18 13:49:50 +10:00
parent d0a2cfe803 a31172464b
commit 791b73cb21
15 changed files with 369 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,16 +41,31 @@
public const string getParam = "{id}";
}
public static class EsppData
{
public const string UploadTemplates = Base + "/espp-data/templates";
//public static class EsppData
//{
// public const string UploadTemplates = Base + "/espp-data/templates";
}
//}
public static class Test
{
public const string GetMyIp = Base + "/tests/my-ip";
}
public static class Template
{
public const string GetAll = Base + "/templates/";
public const string Get = Base + "/templates/" + getParam;
public const string SetOkStatus = Base + "/templates/" + getParam + "/status/ok";
public const string GetByStatusCode = Base + "/templates/status/{statusCode}";
public const string getParam = "{id}";
}
public static class StatusTemplate
{
public const string GetAll = Base + "/template-statuses/";
}

10
PARR.API/Contracts/V1/Requests/Queries/RobinQuery.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace PARR.API.Contracts.V1.Requests.Queries
{
public class RobinQuery
{
/// <summary>
/// Вернуть все значения string. Json в один уровень для Robin.
/// </summary>
public bool? String { get; set; }
}
}

10
PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace PARR.API.Contracts.V1.Requests.Queries
{
public class TemplateQuery
{
/// <summary>
/// Статус шаблона: 10, 20, 30
/// </summary>
public int? StatusCode { get; set; }
}
}

13
PARR.API/Contracts/V1/Responses/StatusTemplateResponse.cs Normal file
View File

@@ -0,0 +1,13 @@
using System.ComponentModel.DataAnnotations;
namespace PARR.API.Contracts.V1.Responses
{
public class StatusTemplateResponse
{
public int Code { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
}
}

52
PARR.API/Contracts/V1/Responses/TemplateResponse.cs Normal file
View File

@@ -0,0 +1,52 @@
namespace PARR.API.Contracts.V1.Responses
{
public class TemplateResponse
{
public required string Name { get; set; }
public bool IsActive { get; set; }
public required string Assignment { get; set; }
public required string Title { get; set; }
public required string Category { get; set; }
public required string Branch { get; set; }
public required string SlaInterval { get; set; }
public required string ConfigurationItem { get; set; }
public required string ContactName { get; set; }
public required string Description { get; set; }
public required string ResolutionCode { get; set; }
public required string Resolution { get; set; }
public required string RzdMTNKprocess { get; set; }
public required string RzdMTNKsubprocess { get; set; }
public required string RzdMTNKtnk { get; set; }
public required string RzdMTNKjob { get; set; }
public required string Assignee { get; set; }
public Guid ParrTemplateId { get; set; }
public int StatusCode { get; set; }
}
public class TemplateStringResponse
{
public required string Name { get; set; }
public required string IsActive { get; set; }
public required string Assignment { get; set; }
public required string Title { get; set; }
public required string Category { get; set; }
public required string Branch { get; set; }
public required string SlaInterval { get; set; }
public required string ConfigurationItem { get; set; }
public required string ContactName { get; set; }
public required string Description { get; set; }
public required string ResolutionCode { get; set; }
public required string Resolution { get; set; }
public required string RzdMTNKprocess { get; set; }
public required string RzdMTNKsubprocess { get; set; }
public required string RzdMTNKtnk { get; set; }
public required string RzdMTNKjob { get; set; }
public required string Assignee { get; set; }
public required string ParrTemplateId { get; set; }
public required string StatusCode { get; set; }
}
}

47
PARR.API/Controllers/V1/EsppDataController.cs
View File

@@ -10,6 +10,7 @@ namespace PARR.API.Controllers.V1
{
public class EsppDataController : BaseApiController
{
private readonly ILogger<EsppDataController> logger;
private readonly IFileService fileService;
private readonly StorageSettings storageSettings;
@@ -19,36 +20,36 @@ namespace PARR.API.Controllers.V1
StorageSettings storageSettings
)
{
Logger = logger;
this.logger = logger;
this.fileService = fileService;
this.storageSettings = storageSettings;
}
public ILogger<EsppDataController> Logger { get; }
// UploadTemplates - неактуально, так как стали брать данные с RabbitMQ
/// <summary>
/// Загрузить файл списка шаблонов полученных из ЕСПП в формате csv
/// </summary>
/// <returns></returns>
[HttpPost(ApiRoutes.EsppData.UploadTemplates)]
public async Task<IActionResult> UploadTemplates([BindRequired] IFormFile file)
{
if (!fileService.IsExtensionAllowed(file, storageSettings.EsppTemplates!.AllowedExtensions))
return BadRequest(
new Response(false,
new List<ErrorModel> {
new ErrorModel {
Message = $"Недопустимое расширение файла. Разрешенные расширения: {string.Join(", ", storageSettings.EsppTemplates.AllowedExtensions)}"
} }));
///// <summary>
///// Загрузить файл списка шаблонов полученных из ЕСПП в формате csv
///// </summary>
///// <returns></returns>
//[HttpPost(ApiRoutes.EsppData.UploadTemplates)]
//public async Task<IActionResult> UploadTemplates([BindRequired] IFormFile file)
//{
// if (!fileService.IsExtensionAllowed(file, storageSettings.EsppTemplates!.AllowedExtensions))
// return BadRequest(
// new Response(false,
// new List<ErrorModel> {
// new ErrorModel {
// Message = $"Недопустимое расширение файла. Разрешенные расширения: {string.Join(", ", storageSettings.EsppTemplates.AllowedExtensions)}"
// } }));
if (!fileService.IsNotExceededLimit(file, storageSettings.EsppTemplates.MaxFileSizeMb))
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(file), Message = $"Размер файла превышает {storageSettings.EsppTemplates.MaxFileSizeMb} МБайт" } }));
// if (!fileService.IsNotExceededLimit(file, storageSettings.EsppTemplates.MaxFileSizeMb))
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { FieldName = nameof(file), Message = $"Размер файла превышает {storageSettings.EsppTemplates.MaxFileSizeMb} МБайт" } }));
var uploadResult = await fileService.UploadAsync(file, storageSettings.EsppTemplates.TemplatePath);
if (uploadResult == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при сохранении файла" } }));
// var uploadResult = await fileService.UploadAsync(file, storageSettings.EsppTemplates.TemplatePath);
// if (uploadResult == null)
// return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = "Ошибка при сохранении файла" } }));
return Ok(new Response<string>("", true, new List<ErrorModel>(), $"Файл загружен."));
}
// return Ok(new Response<string>("", true, new List<ErrorModel>(), $"Файл загружен."));
//}
}
}

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

@@ -10,7 +10,6 @@ using PARR.API.Extensions;
using PARR.API.Services.Interfaces;
using PARR.DAL.DomainModels;
using PARR.DAL.Models.V1;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.V1;
namespace PARR.API.Controllers.V1

42
PARR.API/Controllers/V1/StatusTemplateController.cs Normal file
View File

@@ -0,0 +1,42 @@
using AutoMapper;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.DAL.Services;
namespace PARR.API.Controllers.V1
{
public class StatusTemplateController : BaseApiController
{
private readonly IMapper mapper;
private readonly IStatusTemplateService statusTemplateService;
public StatusTemplateController(
IMapper mapper,
IStatusTemplateService statusTemplateService
)
{
this.mapper = mapper;
this.statusTemplateService = statusTemplateService;
}
/// <summary>
/// Получить список статусов
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatusTemplate.GetAll)]
public async Task<IActionResult> GetAll()
{
var statusList = await statusTemplateService.Get()
.OrderBy(t => t.Code)
.ToListAsync();
var response = mapper.Map<List<StatusTemplateResponse>>(statusList);
return Ok(new Response<List<StatusTemplateResponse>>(response, true));
}
}
}

142
PARR.API/Controllers/V1/TemplateController.cs Normal file
View File

@@ -0,0 +1,142 @@
using AutoMapper;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
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.DAL.Contracts;
using PARR.DAL.DomainModels;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1
{
public class TemplateController : BaseApiController
{
private readonly IMapper mapper;
private readonly ITemplateService templateService;
public TemplateController(
IMapper mapper,
ITemplateService templateService
)
{
this.mapper = mapper;
this.templateService = templateService;
}
/// <summary>
/// Получить список всех шаблонов постранично
/// </summary>
/// <param name="paginationQuery"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Template.GetAll)]
public async Task<IActionResult> GetAll([FromQuery] PaginationQuery paginationQuery, [FromQuery] TemplateQuery filter)
{
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
IQueryable<Template> query = templateService.Get()
.OrderBy(t => t.Name);
if (filter.StatusCode.HasValue)
{
switch (filter.StatusCode.Value)
{
case (int)StatusTemplateEnum.Ok:
query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Ok);
break;
case (int)StatusTemplateEnum.Creating:
query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Creating);
break;
case (int)StatusTemplateEnum.Updating:
query = query.Where(t => t.StatusCode == (int)StatusTemplateEnum.Updating);
break;
default:
break;
}
}
var templates = await templateService.GetPage(query, paginationFilter).ToListAsync();
if (!templates.Any())
return NoContent();
var templateResponse = mapper.Map<List<TemplateResponse>>(templates);
var paginationResponse = new PagedResponse<TemplateResponse>(templateResponse, true).GetPaginatedProps(paginationFilter, query);
return Ok(paginationResponse);
}
/// <summary>
/// Получить шаблон по id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Template.Get)]
public async Task<IActionResult> GetById([FromRoute] Guid id)
{
var template = await templateService.GetAsync(id);
if (template == null)
return NotFound();
var response = mapper.Map<TemplateResponse>(template);
return Ok(new Response<TemplateResponse>(response, true));
}
/// <summary>
/// Получить один шаблон по заданному статусу
/// </summary>
/// <param name="statusCode"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Template.GetByStatusCode)]
public async Task<IActionResult> GetByStatus([FromRoute] int statusCode, [FromQuery] RobinQuery query)
{
var template = await templateService.Get().FirstOrDefaultAsync(t => t.StatusCode == statusCode);
if (template == null)
return NotFound();
var response = mapper.Map<TemplateResponse>(template);
if (query.String == true)
{
var stringResponse = mapper.Map<TemplateStringResponse>(response);
return Ok(stringResponse);
}
return Ok(new Response<TemplateResponse>(response, true));
}
/// <summary>
/// Установить статус ОК для шаблона с id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpPut(ApiRoutes.Template.SetOkStatus)]
public async Task<IActionResult> SetOkStatus([FromRoute] Guid id)
{
var template = await templateService.GetAsync(id);
if (template == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не найден шаблон с id: {id}" } }));
template.StatusCode = (int)StatusTemplateEnum.Ok;
if (!await templateService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при изменении статуса у шаблона с id: {id}" } }));
var response = mapper.Map<TemplateResponse>(template);
return Ok(new Response<TemplateResponse>(response, true));
}
}
}

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

@@ -1,5 +1,6 @@
using AutoMapper;
using PARR.API.Contracts.V1.Responses;
using PARR.DAL.Models;
using PARR.DAL.Models.V1;
namespace PARR.API.MappingProfiles
@@ -23,9 +24,29 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.Script, o => o.MapFrom(s => s.ScriptName));
// === Job ===
CreateMap<V1_JobMode, JobModeResponse>();
CreateMap<Template, TemplateResponse>()
.ForMember(d => d.ParrTemplateId, o => o.MapFrom(s => s.Id))
.ForMember(d => d.Assignment, o => o.MapFrom(s => s.WorkGroup))
.ForMember(d => d.Title, o => o.MapFrom(s => s.ShortDescription))
.ForMember(d => d.Branch, o => o.MapFrom(s => s.ResponseArea))
.ForMember(d => d.SlaInterval, o => o.MapFrom(s => s.Duration))
.ForMember(d => d.ConfigurationItem, o => o.MapFrom(s => s.EK))
.ForMember(d => d.ContactName, o => o.MapFrom(s => s.Initiator))
.ForMember(d => d.Description, o => o.MapFrom(s => s.FullDescription))
.ForMember(d => d.ResolutionCode, o => o.MapFrom(s => s.ClosingCode))
.ForMember(d => d.Resolution, o => o.MapFrom(s => s.Solution))
.ForMember(d => d.RzdMTNKprocess, o => o.MapFrom(s => s.Process))
.ForMember(d => d.RzdMTNKsubprocess, o => o.MapFrom(s => s.SubProcess))
.ForMember(d => d.RzdMTNKtnk, o => o.MapFrom(s => s.TNK))
.ForMember(d => d.RzdMTNKjob, o => o.MapFrom(s => s.Work))
.ForMember(d => d.Assignee, o => o.MapFrom(s => s.Worker));
CreateMap<TemplateResponse, TemplateStringResponse>();
CreateMap<StatusTemplate, StatusTemplateResponse>();
}
}
}

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

@@ -11,6 +11,7 @@ namespace PARR.DAL.Models
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; }
public required string Name { get; set; }
public bool IsActive { get; set; }
public required string WorkGroup { get; set; }

2
PARR.DAL/ParrDalInstaller.cs
View File

@@ -2,6 +2,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using PARR.DAL.Context;
using PARR.DAL.Services;
using PARR.DAL.Services.Implementation;
using PARR.DAL.Services.Implementations;
using PARR.DAL.Services.Implementations.AIHIT;
@@ -33,6 +34,7 @@ namespace PARR.DAL
services.AddTransient<IRawDataEKService, RawDataEKService>();
services.AddTransient<ISettingService, SettingService>();
services.AddTransient<ITemplateService, TemplateService>();
services.AddTransient<IStatusTemplateService, StatusTemplateService>();
}
}
}

9
PARR.DAL/Services/IStatusTemplateService.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.DAL.Models;
namespace PARR.DAL.Services
{
public interface IStatusTemplateService
{
IQueryable<StatusTemplate> Get();
}
}

20
PARR.DAL/Services/Implementations/StatusTemplateService.cs Normal file
View File

@@ -0,0 +1,20 @@
using PARR.DAL.Context;
using PARR.DAL.Models;
namespace PARR.DAL.Services.Implementations
{
internal class StatusTemplateService : IStatusTemplateService
{
private readonly DataContext dataContext;
public StatusTemplateService(DataContext dataContext)
{
this.dataContext = dataContext;
}
public IQueryable<StatusTemplate> Get()
{
return dataContext.StatusTemplates;
}
}
}

3
docker-compose.espp-template-sync.yml
View File

@@ -9,13 +9,14 @@ services:
environment:
- ASPNETCORE_ENVIRONMENT=Production
- TZ=Europe/Moscow
- GlobalSettings__MqSettings__HostName=parr-rabbitmq
#volumes:
#- /var/log/parr-espp-template-sync:/app/log
#- parr_storage_dev:/app/Data
deploy:
replicas: 4
rabbitmq:
parr-rabbitmq:
image: rabbitmq:3.12.4-management
#container_name: rabbitmq
hostname: parr-rabbitmq