Add data provider nsi item result wait

This commit is contained in:
2025-11-05 09:41:52 +09:00
parent acbbc13fa8
commit 5a8b6c2303
9 changed files with 135 additions and 17 deletions

View File

@ -1,4 +1,5 @@
using Hcs.Broker.Api;
using Hcs.Broker.Api.Request;
using Hcs.Service.Async.Nsi;
namespace Hcs.Broker.Mock.Api
@ -21,5 +22,16 @@ namespace Hcs.Broker.Mock.Api
return Guid.NewGuid().ToString();
}
/// <inheritdoc cref="INsiApi"/>
public async Task<RequestSingleResult<NsiItemType>> GetExportDataProviderNsiItemResultAsync(string messageGuid)
{
await Task.Delay(3000);
return new RequestSingleResult<NsiItemType>()
{
Ready = false
};
}
}
}

View File

@ -1,4 +1,5 @@
using Hcs.Service.Async.Nsi;
using Hcs.Broker.Api.Request;
using Hcs.Service.Async.Nsi;
namespace Hcs.Broker.Api
{
@ -20,5 +21,12 @@ namespace Hcs.Broker.Api
/// <param name="token">Токен отмены</param>
/// <returns>Идентификатор сообщения операции экспорта</returns>
Task<string> RequestExportDataProviderNsiItemAsync(exportDataProviderNsiItemRequestRegistryNumber registryNumber, CancellationToken token = default);
/// <summary>
/// Возвращает результат экспорта данных справочника поставщика информации
/// </summary>
/// <param name="messageGuid">Идентификатор сообщения операции экспорта</param>
/// <returns>Результат запроса</returns>
Task<RequestSingleResult<NsiItemType>> GetExportDataProviderNsiItemResultAsync(string messageGuid);
}
}

View File

@ -1,4 +1,5 @@
using Hcs.Broker.Api.Request.Exception;
using Hcs.Broker.Api.Request;
using Hcs.Broker.Api.Request.Exception;
using Hcs.Broker.Api.Request.Nsi;
using Hcs.Service.Async.Nsi;
@ -27,5 +28,12 @@ namespace Hcs.Broker.Api
var request = new ExportDataProviderNsiItemRequest(client);
return await request.SendAsync(registryNumber, token);
}
/// <inheritdoc cref="INsiApi"/>
public async Task<RequestSingleResult<NsiItemType>> GetExportDataProviderNsiItemResultAsync(string messageGuid)
{
var request = new ExportDataProviderNsiItemRequest(client);
return await request.GetResultAsync(messageGuid);
}
}
}

View File

@ -1,4 +1,5 @@
using Hcs.Broker.Internal;
using Hcs.Broker.Api.Request.Adapter;
using Hcs.Broker.Internal;
using Hcs.Service.Async.Nsi;
namespace Hcs.Broker.Api.Request.Nsi
@ -40,5 +41,25 @@ namespace Hcs.Broker.Api.Request.Nsi
return response.AckRequest.Ack;
}, token);
}
internal async Task<RequestSingleResult<NsiItemType>> GetResultAsync(string messageGuid)
{
var result = await ExecuteGetResultAsync(messageGuid);
if (result == null)
{
return RequestSingleResult<NsiItemType>.CreateNotReady();
}
var item = result.Items.FirstOrDefault();
if (item is NsiItemType nsiItem)
{
return RequestSingleResult<NsiItemType>.CreateSuccessful(nsiItem);
}
else if (item is IErrorMessage errorMessage)
{
return RequestSingleResult<NsiItemType>.CreateFailed(errorMessage);
}
return RequestSingleResult<NsiItemType>.CreateFailed(null);
}
}
}

View File

@ -9,16 +9,13 @@ namespace Hcs.WebApp.BackgroundServices.OperationExecutors
{
public IExecutor CreateExecutor(IServiceScope scope, IClient client, Operation operation)
{
switch (operation.Type)
return operation.Type switch
{
case Operation.OperationType.Nsi_ExportNsiItem_15_7_0_1:
return new ExportDataProviderNsiItemExecutor_15_7_0_1(client, scope, operation);
Operation.OperationType.Nsi_ExportNsiItem_15_7_0_1 => new ExportDataProviderNsiItemExecutor_15_7_0_1(client, scope, operation),
Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1 => new ExportNsiItemExecutor_15_7_0_1(client, scope, operation),
case Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1:
return new ExportNsiItemExecutor_15_7_0_1(client, scope, operation);
}
throw new NotImplementedException($"Не удалось создать выполнителя операции типа {operation.Type}");
_ => throw new NotImplementedException($"Не удалось создать выполнителя операции типа {operation.Type}"),
};
}
}
}

View File

@ -26,6 +26,7 @@ namespace Hcs.WebApp.BackgroundServices.OperationExecutors.Nsi
272 => exportDataProviderNsiItemRequestRegistryNumber.Item272,
302 => exportDataProviderNsiItemRequestRegistryNumber.Item302,
337 => exportDataProviderNsiItemRequestRegistryNumber.Item337,
_ => throw new ArgumentException($"Не удалось получить номер справочника из значения {number}"),
};
}

View File

@ -0,0 +1,68 @@
using Hcs.Broker;
using Hcs.WebApp.Data.Hcs;
using Hcs.WebApp.Services;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
namespace Hcs.WebApp.BackgroundServices.ResultGetters.Nsi
{
public class ExportDataProviderNsiItemGetter_15_7_0_1(IClient client, IServiceScope scope, Operation operation) : ResultGetterBase(client, scope, operation)
{
public override async Task<bool> GetAsync()
{
var result = await client.Nsi.GetExportDataProviderNsiItemResultAsync(operation.MessageGuid!);
if (!result.Ready)
{
return false;
}
if (result.Success)
{
var headquartersService = scope.ServiceProvider.GetRequiredService<HeadquartersService>();
var registryService = scope.ServiceProvider.GetRequiredService<RegistryService>();
using var context = headquartersService.GetNewContext();
var executionStrategy = context.Database.CreateExecutionStrategy();
await executionStrategy.ExecuteAsync(async () =>
{
using var transaction = await context.Database.BeginTransactionAsync();
try
{
var registry = await registryService.GetRegistryByOperationIdAsync(context, operation.Id, true);
registry.SyncedAt = DateTime.UtcNow;
registry.Elements?.Clear();
await context.SaveChangesAsync();
registry.Elements ??= [];
foreach (var element in result.Result!.NsiElement)
{
var registryElement = new RegistryElement()
{
Code = element.Code,
GUID = element.GUID,
Json = JsonConvert.SerializeObject(element)
};
registry.Elements.Add(registryElement);
}
await context.SaveChangesAsync();
await headquartersService.SetOperationEndedAsync(context, operation.Id);
await transaction.CommitAsync();
}
catch
{
await transaction.RollbackAsync();
throw;
}
});
return true;
}
throw Failure(result.ErrorMessage);
}
}
}

View File

@ -30,9 +30,11 @@ namespace Hcs.WebApp.BackgroundServices.ResultGetters.NsiCommon
{
var registry = await registryService.GetRegistryByOperationIdAsync(context, operation.Id, true);
registry.SyncedAt = DateTime.UtcNow;
registry.Elements.Clear();
registry.Elements?.Clear();
await context.SaveChangesAsync();
registry.Elements ??= [];
foreach (var element in result.Result!.NsiElement)
{
var registryElement = new RegistryElement()

View File

@ -1,4 +1,5 @@
using Hcs.Broker;
using Hcs.WebApp.BackgroundServices.ResultGetters.Nsi;
using Hcs.WebApp.BackgroundServices.ResultGetters.NsiCommon;
using Hcs.WebApp.Data.Hcs;
@ -8,13 +9,13 @@ namespace Hcs.WebApp.BackgroundServices.ResultGetters
{
public IResultGetter CreateResultGetter(IServiceScope scope, IClient client, Operation operation)
{
switch (operation.Type)
return operation.Type switch
{
case Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1:
return new ExportNsiItemGetter_15_7_0_1(client, scope, operation);
}
Operation.OperationType.Nsi_ExportNsiItem_15_7_0_1 => new ExportDataProviderNsiItemGetter_15_7_0_1(client, scope, operation),
Operation.OperationType.NsiCommon_ExportNsiItem_15_7_0_1 => new ExportNsiItemGetter_15_7_0_1(client, scope, operation),
throw new NotImplementedException($"Не удалось создать получателя результата операции типа {operation.Type}");
_ => throw new NotImplementedException($"Не удалось создать получателя результата операции типа {operation.Type}"),
};
}
}