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

feat(esppTemplateSync): переделал логику, подключил ISyncService

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-11-22 14:19:15 +10:00
parent ede7075eb5
commit dc90275f6f
12 changed files with 144 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.EsppSync/IEsppObject.cs
View File

@@ -6,6 +6,6 @@ namespace PARR.EsppSync
{
public string TemplateName { get; set; }
public RobotsEnum Robot { get; set; }
public RobotsEnum Robot { get; }
}
}

5
PARR.EsppSync/ISyncService.cs
View File

@@ -1,5 +1,4 @@
using PARR.Constants;
using PARR.DAL.Models;
using PARR.DAL.Models;
namespace PARR.EsppSync
{
@@ -9,7 +8,7 @@ namespace PARR.EsppSync
/// <typeparam name="EsppObject"></typeparam>
/// <param name="str"></param>
/// <returns></returns>
public delegate EsppObject ParserHandlerDelegate<EsppObject>(string str) where EsppObject : class, IEsppObject;
public delegate EsppObject? ParserHandlerDelegate<EsppObject>(string str) where EsppObject : class, IEsppObject;
/// <summary>
/// Конвертирует Template в модель для сравнения

12
PARR.EsppTemplateSync/Domain/EsppTemplate.cs → PARR.EsppTemplateSync/Domain/EsppObjectTemplate.cs
View File

@@ -1,8 +1,14 @@
namespace PARR.EsppTemplateSync.Domain
using PARR.Constants;
using PARR.EsppSync;
namespace PARR.EsppTemplateSync.Domain
{
internal class EsppTemplate
internal class EsppObjectTemplate : IEsppObject
{
public required string Name { get; set; }
public required string TemplateName { get; set; }
public RobotsEnum Robot => RobotsEnum.TemplateOrder;
public bool IsActive { get; set; }
public required string WorkGroup { get; set; }
public required string ShortDescription { get; set; }

9
PARR.EsppTemplateSync/EsppTemplateSyncInstaller.cs
View File

@@ -2,7 +2,8 @@
using Microsoft.Extensions.DependencyInjection;
using PARR.BLL;
using PARR.DAL;
using PARR.EsppTemplateSync.Services;
using PARR.EsppSync;
using PARR.EsppTemplateSync.Domain;
using PARR.EsppTemplateSync.Settings;
namespace PARR.EsppTemplateSync
@@ -12,16 +13,14 @@ namespace PARR.EsppTemplateSync
public static void InstallEsppTemplateSyncServices(this IServiceCollection services, IConfiguration configuration)
{
services.InstallBllServices(configuration);
services.InstallDalServices(configuration);
//services.InstallDalServices(configuration);
services.InstallEsppSyncServices<EsppObjectTemplate>(configuration);
var globalSettings = new GlobalSettings();
configuration.GetSection(nameof(GlobalSettings)).Bind(globalSettings);
services.AddSingleton(globalSettings);
services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
services.AddTransient<ITemplateSyncer, TemplateMQSyncer>();
services.AddTransient<IParserService, ParserService>();
services.AddTransient<IManager, Manager>();
}
public static IConfigurationBuilder AddEsppTemplateConfigurations(this IConfigurationBuilder builder, IServiceCollection services)

30
PARR.EsppTemplateSync/MappingProfiles/DomainToDomainProfile.cs
View File

@@ -1,30 +0,0 @@
using AutoMapper;
using PARR.DAL.Models;
using PARR.EsppTemplateSync.Domain;
namespace PARR.EsppTemplateSync.MappingProfiles
{
public class DomainToDomainProfile : Profile
{
public DomainToDomainProfile()
{
CreateMap<Template, EsppTemplate>()
.ForMember(d => d.Name, o => o.MapFrom(s => s.Name))
.ForMember(d => d.IsActive, o => o.MapFrom(s => s.IsActiveTemplate))
.ForMember(d => d.WorkGroup, o => o.MapFrom(s => s.Host!.WorkGroup))
.ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.ApplicationsInWork!.ShortDescription))
.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Host!.ResponseArea!.Name))
.ForMember(d => d.Duration, o => o.MapFrom(s => s.ApplicationsInWork!.TemplateDuration))
.ForMember(d => d.EK, o => o.MapFrom(s => s.Host!.Ek))
//.ForMember(d => d.Initiator, o => o.MapFrom(s => )) TODO откуда то нужно брать инициатора
.ForMember(d => d.FullDescription, o => o.MapFrom(s => s.ApplicationsInWork!.FullDescription))
//.ForMember(d => d.ClosingCode, o => o.MapFrom(s => s.)) TODO toоda же к инициатору
.ForMember(d => d.Solution, o => o.MapFrom(s => s.ApplicationsInWork!.Solution))
.ForMember(d => d.Process, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process!.Name))
.ForMember(d => d.SubProcess, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Name))
.ForMember(d => d.TNK, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Name))
.ForMember(d => d.Work, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Name));
}
}
}

1
PARR.EsppTemplateSync/PARR.EsppTemplateSync.csproj
View File

@@ -7,7 +7,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.4" />
</ItemGroup>

8
PARR.EsppTemplateSync/Services/IManager.cs
View File

@@ -1,8 +0,0 @@
namespace PARR.EsppTemplateSync.Services
{
internal interface IManager
{
Task<bool> ManageFileAsync(string path);
Task ManageStringAsync(string str);
}
}

9
PARR.EsppTemplateSync/Services/IParserService.cs
View File

@@ -1,9 +0,0 @@
using PARR.EsppTemplateSync.Domain;
namespace PARR.EsppTemplateSync.Services
{
internal interface IParserService
{
EsppTemplate? ParseString(string str);
}
}

180
PARR.EsppTemplateSync/Services/Manager.cs
View File

@@ -1,180 +0,0 @@
using AutoMapper;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using PARR.Constants;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
using PARR.EsppTemplateSync.Domain;
using PARR.EsppTemplateSync.Settings;
namespace PARR.EsppTemplateSync.Services
{
internal class Manager : IManager
{
private readonly ILogger<Manager> logger;
private readonly IServiceProvider serviceProvider;
private readonly IParserService parserService;
private readonly GlobalSettings globalSettings;
private readonly IMapper mapper;
public Manager(
ILogger<Manager> logger,
IServiceProvider serviceProvider,
IParserService parserService,
GlobalSettings globalSettings,
IMapper mapper
)
{
this.logger = logger;
this.serviceProvider = serviceProvider;
this.parserService = parserService;
this.globalSettings = globalSettings;
this.mapper = mapper;
}
public Task<bool> ManageFileAsync(string path)
{
throw new NotImplementedException();
}
public async Task ManageStringAsync(string str)
{
// тут обязательно нужна проверка, если str не того формата, возникает exception в ParseStringAsync
if (string.IsNullOrEmpty(str))
return;
var esppTemplate = parserService.ParseString(str);
if (esppTemplate == null)
{
return;
}
else
{
//если шаблон не аквтивен, пропускаем
//if (!esppTemplate.IsActive)
//{
// return isSuccess;
//}
await SyncTemplateAsync(esppTemplate);
}
return;
}
private async Task SyncTemplateAsync(EsppTemplate esppTemplate)
{
using (var scope = serviceProvider.CreateScope())
{
var services = scope.ServiceProvider;
var templateService = services.GetService<ITemplateService>();
if (templateService == null)
throw new Exception($"Не найден сервис: {nameof(ITemplateService)}");
var robotConfigurationService = services.GetService<IRobotConfigurationService>();
if (robotConfigurationService == null)
throw new Exception($"Не найден сервис: {nameof(IRobotConfigurationService)}");
Template? template = await templateService.GetTemplateByNameAsync(esppTemplate.Name);
//существует в ЕСПП но отсутствует в ПАРР.
//TODO деактивируем и видимо ещё что-то нужно
if (template == null)
{
// создает запись-шаблон из ЕСПП в ПАРР. Возможно избыточно так как эталон в ПАРР
////esppTemplate.StatusCode = "Deactivating";
////---
//esppTemplate.StatusCode = (int)StatusTemplateEnum.Ok;
//esppTemplate.IsActive = false;
//if (!await templateService.CreateAsync(esppTemplate) || !await templateService.CommitAsync())
//{
// logger.LogError($"Не удалось создать запись Template {esppTemplate.Name}({esppTemplate.ShortDescription})");
//}
//else
// logger.LogInformation($"----- Создана запись Template {esppTemplate.Name}({esppTemplate.ShortDescription}) -----");
//---
logger.LogWarning($"----- Найден шаблон ЕСПП незарегистрированный в ПАРР {esppTemplate.Name}({esppTemplate.ShortDescription}) -----");
return;
}
else
{
var mappedTemplate = mapper.Map<EsppTemplate>(template);
if (mappedTemplate == null)
return;
var isChanged = IsChanged(mappedTemplate, esppTemplate);
if (isChanged)
{
SetUpdateStatus(template, robotConfigurationService);
if (!await templateService.CommitAsync())
logger.LogError($"Не удалось изменить запись Template {template.Name}");
else
logger.LogInformation($"----- Установлен принудительный статус {TaskStatusEnum.Updating} Template {template.Name} -----");
} //надо ли проверять если не изменился, но был статус Updating не понятно. Доверяем роботу пока, что после окончания работ он точно сообщит
else
{
//если все поля совпали
//проверяем, какой был статус у шаблона, если он был не Ок, то ставим ему ОК
var robotConfig = robotConfigurationService.GetFromTemplateByRobotCode(RobotsEnum.TemplateOrder, ref template);
if (robotConfig.TaskStatusCode != (int)TaskStatusEnum.Ok)
{
robotConfigurationService.ChangeTaskStatus(TaskStatusEnum.Ok, ref robotConfig);
if (!await templateService.CommitAsync())
logger.LogError($"Не удалось изменить запись Template {template.Name}");
else
logger.LogInformation($"----- Установлен принудительный статус {TaskStatusEnum.Ok.ToString()} Template {template.Name} -----");
}
}
}
}
return;
}
private void SetUpdateStatus(Template template, IRobotConfigurationService robotConfigurationService)
{
var robotConfig = robotConfigurationService.GetFromTemplateByRobotCode(RobotsEnum.TemplateOrder, ref template);
robotConfigurationService.ChangeTaskStatus(TaskStatusEnum.Updating, ref robotConfig);
}
private bool IsChanged(EsppTemplate template, EsppTemplate esppTemplate)
{
foreach (var prop in template.GetType().GetProperties())
{
if (prop == null)
continue;
if (globalSettings.IgnoreTemplateFields != null && globalSettings.IgnoreTemplateFields.Contains(prop.Name))
continue;
var parrValue = template.GetType().GetProperty(prop.Name)?.GetValue(template, null);
var esppValue = esppTemplate.GetType().GetProperty(prop.Name)?.GetValue(esppTemplate, null);
if (parrValue == null || esppValue == null)
continue;
//Replace("\r","").Replace("\n","") - в подробном описании могут быть переносы строк, в Rabbit прилетает без переносов. Убираем переносы для стравнения
var parrValueStr = parrValue!.ToString()!.ToLower().Replace("\r", "").Replace("\n", "");
var esppValueStr = esppValue!.ToString()!.ToLower();
if (parrValueStr != esppValueStr)
{
logger.LogDebug($"Не совпадают поля. parrValueStr: {parrValueStr}, esppValueStr: {esppValueStr}");
return true;
}
}
return false;
}
}
}

170
PARR.EsppTemplateSync/Services/ParserService.cs
View File

@@ -1,170 +0,0 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Contracts;
using PARR.EsppTemplateSync.Domain;
using PARR.EsppTemplateSync.Settings;
using System.Globalization;
namespace PARR.EsppTemplateSync.Services
{
internal class ParserService : IParserService
{
private readonly ILogger<ParserService> logger;
private readonly GlobalSettings globalSettings;
private readonly SettingsFromDb settingsFromDb;
public ParserService(
ILogger<ParserService> logger,
GlobalSettings globalSettings,
SettingsFromDb settingsFromDb
)
{
this.logger = logger;
this.globalSettings = globalSettings;
this.settingsFromDb = settingsFromDb;
}
public async Task<bool> ParseFileAsync(string path)
{
//TODO:
bool isSuccess = true;
return isSuccess;
}
public EsppTemplate? ParseString(string str)
{
// TODO: а если формат нет тот? Все будет ок?
var splittedContent = str.Split(globalSettings.ParsingSeparator);
if (splittedContent.Length != 17)
{
return null;
}
//var name = splittedContent[0].Trim().Substring(1, splittedContent[0].Length - 2);
var name = splittedContent[0].Trim();
CultureInfo currentCulture = Thread.CurrentThread.CurrentCulture;
if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName)
&& !name.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture)
)
{
logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixName}). Шаблон {name} игнорирован");
return null;
}
if (!bool.TryParse(splittedContent[1].Trim(), out var isActive))
isActive = false;
var workGroup = splittedContent[2].Trim();
var shortDescription = splittedContent[3].Trim();
var category = splittedContent[4].Trim();
var responseArea = splittedContent[5].Trim();
var duration = splittedContent[6].Trim();
var ek = splittedContent[7].Trim();
var initiator = splittedContent[8].Trim();
var fullDescription = splittedContent[9].Trim();
var closingCode = splittedContent[10].Trim();
var solution = splittedContent[11].Trim();
var process = splittedContent[12].Trim();
var subProcess = splittedContent[13].Trim();
var tnk = splittedContent[14].Trim();
var work = splittedContent[15].Trim();
var worker = splittedContent[16].Trim();
var template = new EsppTemplate
{
Name = name,
IsActive = isActive,
WorkGroup = workGroup,
ShortDescription = shortDescription,
//Category = category,
ResponseArea = responseArea,
Duration = duration,
EK = ek,
//Initiator = initiator,
FullDescription = fullDescription,
//ClosingCode = closingCode,
Solution = solution,
Process = process,
SubProcess = subProcess,
TNK = tnk,
Work = work,
//Worker = worker
};
return template;
}
private DateTimeOffset? ConvertDateFromStr(string dateString)
{
var format = "dd/MM/yy HH:mm:ss";
var provider = CultureInfo.CurrentCulture;
try
{
var result = DateTimeOffset.ParseExact(dateString, format, provider).ToOffset(new TimeSpan(0));
logger.LogInformation($"{dateString} было преобразовано в {result.ToString()}.");
return result;
}
catch (FormatException)
{
logger.LogWarning($"{dateString} имеет некоррктный формат для преобразование в DateTimeOffset");
}
return null;
}
}
//// dll
//public delegate Dt CustomParserHandlerDelegate<Dt>(string str);
//public class Converter
//{
// public T ParseString<T>(string str, CustomParserHandlerDelegate<T> customParser)
// {
// var obj = customParser(str);
// return obj;
// }
//}
//public class RunConverter
//{
// public void Run<T>(CustomParserHandlerDelegate<T> customParser)
// {
// var conv = new Converter();
// //var obj = conv.ParseString("sdfsdfsdf", SuperParser);
// var obj = conv.ParseString("sdfsdfsdf", customParser);
// }
//}
////---
//public class Xxx
//{
// void Test()
// {
// var rc = new RunConverter();
// rc.Run(SuperParser);
// }
// Model1 SuperParser(string str)
// {
// // custom logic
// return new Model1 { Field = str };
// }
//}
//public class Model1
//{
// public string Field { get; set; } = "111";
//}
}

29
PARR.EsppTemplateSync/TemplateFileSyncer.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.Extensions.Logging;
using PARR.BLL.Services.Interfaces;
using PARR.EsppTemplateSync.Services;
using PARR.EsppTemplateSync.Settings;
namespace PARR.EsppTemplateSync
@@ -10,7 +9,7 @@ namespace PARR.EsppTemplateSync
private readonly ILogger<TemplateFileSyncer> logger;
private readonly IFileService fileService;
private readonly GlobalSettings globalSettings;
private readonly IManager manager;
//private readonly IManager manager;
private readonly string dirPath;
private readonly string filterExtensions;
@@ -20,14 +19,14 @@ namespace PARR.EsppTemplateSync
BLL.Settings.StorageSettings storageSettings,
ILogger<TemplateFileSyncer> logger,
IFileService fileService,
GlobalSettings globalSettings,
IManager manager
GlobalSettings globalSettings//,
// IManager manager
)
{
this.logger = logger;
this.fileService = fileService;
this.globalSettings = globalSettings;
this.manager = manager;
//this.manager = manager;
if (storageSettings.EsppTemplates == null)
{
logger.LogError("Нет секции настроек хранилища. StorageSettings, EsppTemplates");
@@ -120,17 +119,17 @@ namespace PARR.EsppTemplateSync
private async Task ParseFileAsync(string path)
{
logger.LogInformation($"--- --- Найден файл. Готов для парсинга {path} --- ---");
var parseResult = await manager.ManageFileAsync(path);//parserService.ParseFileAsync(path);
//var parseResult = await manager.ManageFileAsync(path);//parserService.ParseFileAsync(path);
if (parseResult)
{
logger.LogInformation($"Парсинг успешно завершен. Удаляю файл {path}");
var removeResult = fileService.DeleteFile(path);
}
else
{
logger.LogError($"Парсинг завершен c ошибкой. Файл не удален {path}");
}
//if (parseResult)
//{
// logger.LogInformation($"Парсинг успешно завершен. Удаляю файл {path}");
// var removeResult = fileService.DeleteFile(path);
//}
//else
//{
// logger.LogError($"Парсинг завершен c ошибкой. Файл не удален {path}");
//}
}
}

121
PARR.EsppTemplateSync/TemplateMQSyncer.cs
View File

@@ -1,6 +1,9 @@
using Microsoft.Extensions.Logging;
using PARR.BLL.Services.Interfaces;
using PARR.EsppTemplateSync.Services;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.EsppSync;
using PARR.EsppTemplateSync.Domain;
using PARR.EsppTemplateSync.Settings;
namespace PARR.EsppTemplateSync
@@ -8,22 +11,24 @@ namespace PARR.EsppTemplateSync
internal class TemplateMQSyncer : ITemplateSyncer
{
private readonly ILogger<TemplateMQSyncer> logger;
private readonly IManager manager;
private readonly GlobalSettings globalSettings;
private readonly IMqService mqService;
private readonly ISyncService<EsppObjectTemplate> syncService;
private readonly SettingsFromDb settingsFromDb;
public TemplateMQSyncer(
ILogger<TemplateMQSyncer> logger,
IManager manager,
GlobalSettings globalSettings,
IMqService mqService
IMqService mqService,
ISyncService<EsppObjectTemplate> syncService,
SettingsFromDb settingsFromDb
)
{
this.logger = logger;
this.manager = manager;
this.globalSettings = globalSettings;
this.mqService = mqService;
this.syncService = syncService;
this.settingsFromDb = settingsFromDb;
if (globalSettings.MqSettings == null)
{
logger.LogError("Нет секции настроек хранилища. MqSettings, EsppTemplates");
@@ -33,7 +38,7 @@ namespace PARR.EsppTemplateSync
public void Start()
{
var isConnected = mqService.InitConsumer(globalSettings!.MqSettings!, manager.ManageStringAsync);
var isConnected = mqService.InitConsumer(globalSettings!.MqSettings!, SyncTemplateAsync);
if (!isConnected)
throw new Exception("Ошибка при подключении к RabbitMq");
@@ -48,6 +53,108 @@ namespace PARR.EsppTemplateSync
logger.LogInformation($"=== === === Соединение с очередью {globalSettings.MqSettings!.QueueName} закрыто === === ===");
}
private async Task SyncTemplateAsync(string str)
{
await syncService.SyncEsppObjectAsync(str, ParseStrToEsppObject, ConvertDbObjToEsppObj);
}
/// <summary>
/// Преобразование модели БД в модель для сравнения
/// </summary>
/// <param name="template"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
private EsppObjectTemplate ConvertDbObjToEsppObj(Template template)
{
var templateFromDb = new EsppObjectTemplate
{
TemplateName = template.Name,
IsActive = template.IsActiveTemplate,
WorkGroup = template.Host!.WorkGroup!,
ShortDescription = template.ApplicationsInWork!.ShortDescription,
ResponseArea = template.Host!.ResponseArea!.Name,
Duration = template.ApplicationsInWork.TemplateDuration,
EK = template.Host.Ek,
FullDescription = template.ApplicationsInWork.FullDescription,
Solution = template.ApplicationsInWork.Solution,
Process = template.ApplicationsInWork.Work!.Tnk!.Subprocess!.Process!.Name,
SubProcess = template.ApplicationsInWork.Work.Tnk.Subprocess.Name,
TNK = template.ApplicationsInWork.Work.Tnk.Name,
Work = template.ApplicationsInWork.Work.Name
};
return templateFromDb;
}
/// <summary>
/// Парсинг из строки в модель для сравнения
/// </summary>
/// <param name="str"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
private EsppObjectTemplate? ParseStrToEsppObject(string str)
{
var splittedContent = str.Split(globalSettings.ParsingSeparator);
if (splittedContent.Length != 17)
{
logger.LogError($"Входная строка после сплита не содержит 17 объектов (факт: {splittedContent.Length}).");
return null;
}
var templateName = splittedContent[0].Trim();
var currentCulture = Thread.CurrentThread.CurrentCulture;
if (!string.IsNullOrEmpty(settingsFromDb.TemplatePrefixName) && !templateName.StartsWith(settingsFromDb.TemplatePrefixName, true, currentCulture))
{
logger.LogWarning($"Имя шаблона не соответствует обязательному префиксу({settingsFromDb.TemplatePrefixName}). Шаблон {templateName} игнорирован");
return null;
}
bool.TryParse(splittedContent[1].Trim(), out var isActive);
var workGroup = splittedContent[2].Trim();
var shortDescription = splittedContent[3].Trim();
var category = splittedContent[4].Trim();
var responseArea = splittedContent[5].Trim();
var duration = splittedContent[6].Trim();
var ek = splittedContent[7].Trim();
var initiator = splittedContent[8].Trim();
var fullDescription = splittedContent[9].Trim();
var closingCode = splittedContent[10].Trim();
var solution = splittedContent[11].Trim();
var process = splittedContent[12].Trim();
var subProcess = splittedContent[13].Trim();
var tnk = splittedContent[14].Trim();
var work = splittedContent[15].Trim();
var worker = splittedContent[16].Trim();
var templateFromEspp = new EsppObjectTemplate
{
TemplateName = templateName,
IsActive = isActive,
WorkGroup = workGroup,
ShortDescription = shortDescription,
//Category = category,
ResponseArea = responseArea,
Duration = duration,
EK = ek,
//Initiator = initiator,
FullDescription = fullDescription,
//ClosingCode = closingCode,
Solution = solution,
Process = process,
SubProcess = subProcess,
TNK = tnk,
Work = work
//Worker = worker
};
return templateFromEspp;
}
}
}