Skip to content

Commit

Permalink
Merge pull request #20 from YPermitin/develop
Browse files Browse the repository at this point in the history 
Улучшена загрузка информации о версиях ФИАС
  • Loading branch information
@YPermitin
YPermitin authored Jul 29, 2023
2 parents d45804d + a9280d9 commit 761f589
Showing 1 changed file with 145 additions and 101 deletions.
246 changes: 145 additions & 101 deletions Libs/YPermitin.FIASToolSet.Jobs/JobItems/ActualizeFIASVersionHistoryJob.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Quartz;
using YPermitin.FIASToolSet.DistributionBrowser;
using YPermitin.FIASToolSet.DistributionBrowser.Extensions;
using YPermitin.FIASToolSet.DistributionBrowser.Models;
using YPermitin.FIASToolSet.Storage.Core.Models;
using YPermitin.FIASToolSet.Storage.Core.Services;

Expand Down Expand Up @@ -41,135 +42,178 @@ public async Task Execute(IJobExecutionContext context)

// Последняя версия из хранилища
var lastVersion = await fiasMaintenanceService.GetLastVersion();
// Последняя версия из API ФНС
var fiasActualDistributionInfo = await fiasDistributionBrowser.GetLastDistributionInfo();

bool versionChanged;

// Получаем историю версий ФИАС, чтобы дозагрузить все пропущенные версии, а не только последнюю.
IReadOnlyList<FIASDistributionInfo> fiasVersionHistory;
if (lastVersion == null)
{
_logger.LogInformation("Информацию о предыдущей версии ФИАС в хранилище не обнаружено.");
versionChanged = true;
fiasVersionHistory = new List<FIASDistributionInfo>()
{
await fiasDistributionBrowser.GetLastDistributionInfo()
}.AsReadOnly();
}
else
{
// Если версии различаются хотя бы одним полем, то добавляем новую версию
versionChanged =
lastVersion.VersionId != fiasActualDistributionInfo.VersionId
|| lastVersion.Date != fiasActualDistributionInfo.Date
|| lastVersion.TextVersion != fiasActualDistributionInfo.TextVersion
|| lastVersion.FIASDbfComplete != fiasActualDistributionInfo.FIASDbf.Complete.GetAbsoluteUri()
|| lastVersion.FIASDbfDelta != fiasActualDistributionInfo.FIASDbf.Delta.GetAbsoluteUri()
|| lastVersion.FIASXmlComplete != fiasActualDistributionInfo.FIASXml.Complete.GetAbsoluteUri()
|| lastVersion.FIASXmlDelta != fiasActualDistributionInfo.FIASXml.Delta.GetAbsoluteUri()
|| lastVersion.GARFIASXmlComplete != fiasActualDistributionInfo.GARFIASXml.Complete.GetAbsoluteUri()
|| lastVersion.GARFIASXmlDelta != fiasActualDistributionInfo.GARFIASXml.Delta.GetAbsoluteUri()
|| lastVersion.KLADR4ArjComplete != fiasActualDistributionInfo.KLADR4Arj.Complete.GetAbsoluteUri()
|| lastVersion.KLADR47zComplete != fiasActualDistributionInfo.KLADR47z.Complete.GetAbsoluteUri();

if (versionChanged)
{
_logger.LogInformation("Зафиксированы изменения в данных версии ФИАС.");
_logger.LogInformation($"Period: [{lastVersion.Period}] -> [-].");
_logger.LogInformation($"Id: [{lastVersion.Id}] -> [-].");
_logger.LogInformation($"VersionId: [{lastVersion.VersionId}] -> [{fiasActualDistributionInfo.VersionId}].");
_logger.LogInformation($"TextVersion: [{lastVersion.TextVersion}] -> [{fiasActualDistributionInfo.TextVersion}].");
_logger.LogInformation($"Date: [{lastVersion.Date}] -> [{fiasActualDistributionInfo.Date}].");
_logger.LogInformation($"FIASDbfComplete: [{lastVersion.FIASDbfComplete}] -> [{fiasActualDistributionInfo.FIASDbf.Complete}].");
_logger.LogInformation($"FIASDbfDelta: [{lastVersion.FIASDbfDelta}] -> [{fiasActualDistributionInfo.FIASDbf.Delta}].");
_logger.LogInformation($"FIASXmlComplete: [{lastVersion.FIASXmlComplete}] -> [{fiasActualDistributionInfo.FIASXml.Complete}].");
_logger.LogInformation($"FIASXmlDelta: [{lastVersion.FIASXmlDelta}] -> [{fiasActualDistributionInfo.FIASXml.Delta}].");
_logger.LogInformation($"GARFIASXmlComplete: [{lastVersion.GARFIASXmlComplete}] -> [{fiasActualDistributionInfo.GARFIASXml.Complete}].");
_logger.LogInformation($"GARFIASXmlDelta: [{lastVersion.GARFIASXmlDelta}] -> [{fiasActualDistributionInfo.GARFIASXml.Delta}].");
_logger.LogInformation($"KLADR4ArjComplete: [{lastVersion.KLADR4ArjComplete}] -> [{fiasActualDistributionInfo.KLADR4Arj.Complete}].");
_logger.LogInformation($"KLADR47zComplete: [{lastVersion.KLADR47zComplete}] -> [{fiasActualDistributionInfo.KLADR47z.Complete}].");
}
fiasVersionHistory = await fiasDistributionBrowser.GetAllDistributionInfo();
fiasVersionHistory = fiasVersionHistory
.Where(e => e.VersionId >= lastVersion.VersionId && e.Date >= lastVersion.Date)
.OrderBy(e => e.VersionId)
.ToList()
.AsReadOnly();
}

if (versionChanged)
foreach (var fiasActualDistributionInfo in fiasVersionHistory)
{
await fiasMaintenanceService.BeginTransactionAsync();

var newFIASVersion = new FIASVersion()
{
Period = DateTime.UtcNow,
Id = Guid.NewGuid(),
TextVersion = fiasActualDistributionInfo.TextVersion,
Date = fiasActualDistributionInfo.Date,
VersionId = fiasActualDistributionInfo.VersionId,
FIASDbfComplete = fiasActualDistributionInfo.FIASDbf.Complete.GetAbsoluteUri(),
FIASDbfDelta = fiasActualDistributionInfo.FIASDbf.Delta.GetAbsoluteUri(),
FIASXmlComplete = fiasActualDistributionInfo.FIASXml.Complete.GetAbsoluteUri(),
FIASXmlDelta = fiasActualDistributionInfo.FIASXml.Delta.GetAbsoluteUri(),
GARFIASXmlComplete = fiasActualDistributionInfo.GARFIASXml.Complete.GetAbsoluteUri(),
GARFIASXmlDelta = fiasActualDistributionInfo.GARFIASXml.Delta.GetAbsoluteUri(),
KLADR4ArjComplete = fiasActualDistributionInfo.KLADR4Arj.Complete.GetAbsoluteUri(),
KLADR47zComplete = fiasActualDistributionInfo.KLADR47z.Complete.GetAbsoluteUri()
};

await fiasMaintenanceService.AddVersion(newFIASVersion);

bool useNotifications = _configuration.GetValue("Jobs:EnableNotification", false);
if (useNotifications)
{
await fiasMaintenanceService.AddNotification(new NotificationQueue()
{
Period = DateTime.UtcNow,
Id = Guid.NewGuid(),
NotificationTypeId = NotificationType.NewVersionOfFIAS,
StatusId = NotificationStatus.Added,
FIASVersionId = newFIASVersion.Id,
Content = null
});
}

await fiasMaintenanceService.SaveAsync();

bool fullUrlChanged;
bool deltaUrlChanged;
_logger.LogInformation($"Начало проверки версии ФИАС: {fiasActualDistributionInfo.VersionId}.");

bool versionChanged;
// Последняя версия из хранилища
lastVersion = await fiasMaintenanceService.GetLastVersion();
if (lastVersion == null)
{
fullUrlChanged = true;
deltaUrlChanged = true;
_logger.LogInformation("Информацию о предыдущей версии ФИАС в хранилище не обнаружено.");
versionChanged = true;
}
else
{
fullUrlChanged = lastVersion.GARFIASXmlComplete != newFIASVersion.GARFIASXmlComplete;
deltaUrlChanged = lastVersion.GARFIASXmlDelta != newFIASVersion.GARFIASXmlDelta;
// Если версии различаются хотя бы одним полем, то добавляем новую версию
versionChanged =
lastVersion.VersionId != fiasActualDistributionInfo.VersionId
|| lastVersion.Date != fiasActualDistributionInfo.Date
|| lastVersion.TextVersion != fiasActualDistributionInfo.TextVersion
|| lastVersion.FIASDbfComplete !=
fiasActualDistributionInfo.FIASDbf.Complete.GetAbsoluteUri()
|| lastVersion.FIASDbfDelta != fiasActualDistributionInfo.FIASDbf.Delta.GetAbsoluteUri()
|| lastVersion.FIASXmlComplete !=
fiasActualDistributionInfo.FIASXml.Complete.GetAbsoluteUri()
|| lastVersion.FIASXmlDelta != fiasActualDistributionInfo.FIASXml.Delta.GetAbsoluteUri()
|| lastVersion.GARFIASXmlComplete !=
fiasActualDistributionInfo.GARFIASXml.Complete.GetAbsoluteUri()
|| lastVersion.GARFIASXmlDelta !=
fiasActualDistributionInfo.GARFIASXml.Delta.GetAbsoluteUri()
|| lastVersion.KLADR4ArjComplete !=
fiasActualDistributionInfo.KLADR4Arj.Complete.GetAbsoluteUri()
|| lastVersion.KLADR47zComplete !=
fiasActualDistributionInfo.KLADR47z.Complete.GetAbsoluteUri();

if (versionChanged)
{
_logger.LogInformation("Зафиксированы изменения в данных версии ФИАС.");
_logger.LogInformation($"Period: [{lastVersion.Period}] -> [-].");
_logger.LogInformation($"Id: [{lastVersion.Id}] -> [-].");
_logger.LogInformation(
$"VersionId: [{lastVersion.VersionId}] -> [{fiasActualDistributionInfo.VersionId}].");
_logger.LogInformation(
$"TextVersion: [{lastVersion.TextVersion}] -> [{fiasActualDistributionInfo.TextVersion}].");
_logger.LogInformation(
$"Date: [{lastVersion.Date}] -> [{fiasActualDistributionInfo.Date}].");
_logger.LogInformation(
$"FIASDbfComplete: [{lastVersion.FIASDbfComplete}] -> [{fiasActualDistributionInfo.FIASDbf.Complete}].");
_logger.LogInformation(
$"FIASDbfDelta: [{lastVersion.FIASDbfDelta}] -> [{fiasActualDistributionInfo.FIASDbf.Delta}].");
_logger.LogInformation(
$"FIASXmlComplete: [{lastVersion.FIASXmlComplete}] -> [{fiasActualDistributionInfo.FIASXml.Complete}].");
_logger.LogInformation(
$"FIASXmlDelta: [{lastVersion.FIASXmlDelta}] -> [{fiasActualDistributionInfo.FIASXml.Delta}].");
_logger.LogInformation(
$"GARFIASXmlComplete: [{lastVersion.GARFIASXmlComplete}] -> [{fiasActualDistributionInfo.GARFIASXml.Complete}].");
_logger.LogInformation(
$"GARFIASXmlDelta: [{lastVersion.GARFIASXmlDelta}] -> [{fiasActualDistributionInfo.GARFIASXml.Delta}].");
_logger.LogInformation(
$"KLADR4ArjComplete: [{lastVersion.KLADR4ArjComplete}] -> [{fiasActualDistributionInfo.KLADR4Arj.Complete}].");
_logger.LogInformation(
$"KLADR47zComplete: [{lastVersion.KLADR47zComplete}] -> [{fiasActualDistributionInfo.KLADR47z.Complete}].");
}
}

if (fullUrlChanged || deltaUrlChanged)
if (versionChanged)
{
var lastInstallation = await fiasInstallationManagerService.GetLastInstallation();
if (lastInstallation == null)
await fiasMaintenanceService.BeginTransactionAsync();

var newFIASVersion = new FIASVersion()
{
Period = DateTime.UtcNow,
Id = Guid.NewGuid(),
TextVersion = fiasActualDistributionInfo.TextVersion,
Date = fiasActualDistributionInfo.Date,
VersionId = fiasActualDistributionInfo.VersionId,
FIASDbfComplete = fiasActualDistributionInfo.FIASDbf.Complete.GetAbsoluteUri(),
FIASDbfDelta = fiasActualDistributionInfo.FIASDbf.Delta.GetAbsoluteUri(),
FIASXmlComplete = fiasActualDistributionInfo.FIASXml.Complete.GetAbsoluteUri(),
FIASXmlDelta = fiasActualDistributionInfo.FIASXml.Delta.GetAbsoluteUri(),
GARFIASXmlComplete = fiasActualDistributionInfo.GARFIASXml.Complete.GetAbsoluteUri(),
GARFIASXmlDelta = fiasActualDistributionInfo.GARFIASXml.Delta.GetAbsoluteUri(),
KLADR4ArjComplete = fiasActualDistributionInfo.KLADR4Arj.Complete.GetAbsoluteUri(),
KLADR47zComplete = fiasActualDistributionInfo.KLADR47z.Complete.GetAbsoluteUri()
};

await fiasMaintenanceService.AddVersion(newFIASVersion);

bool useNotifications = _configuration.GetValue("Jobs:EnableNotification", false);
if (useNotifications)
{
if (fullUrlChanged)
await fiasMaintenanceService.AddNotification(new NotificationQueue()
{
Period = DateTime.UtcNow,
Id = Guid.NewGuid(),
NotificationTypeId = NotificationType.NewVersionOfFIAS,
StatusId = NotificationStatus.Added,
FIASVersionId = newFIASVersion.Id,
Content = null
});
}

await fiasMaintenanceService.SaveAsync();

bool fullUrlChanged;
bool deltaUrlChanged;
if (lastVersion == null)
{
fullUrlChanged = true;
deltaUrlChanged = true;
}
else
{
fullUrlChanged = lastVersion.GARFIASXmlComplete != newFIASVersion.GARFIASXmlComplete;
deltaUrlChanged = lastVersion.GARFIASXmlDelta != newFIASVersion.GARFIASXmlDelta;
}

if (fullUrlChanged || deltaUrlChanged)
{
var lastInstallation = await fiasInstallationManagerService.GetLastInstallation();
if (lastInstallation == null)
{
if (fullUrlChanged)
{
fiasInstallationManagerService.AddInstallation(new FIASVersionInstallation()
{
Id = Guid.NewGuid(),
FIASVersionId = newFIASVersion.Id,
StatusId = FIASVersionInstallationStatus.New,
InstallationTypeId = FIASVersionInstallationType.Full,
Created = DateTime.UtcNow
});
}
}
else
{
fiasInstallationManagerService.AddInstallation(new FIASVersionInstallation()
{
Id = Guid.NewGuid(),
FIASVersionId = newFIASVersion.Id,
StatusId = FIASVersionInstallationStatus.New,
InstallationTypeId = FIASVersionInstallationType.Full,
InstallationTypeId = FIASVersionInstallationType.Update,
Created = DateTime.UtcNow
});
}
}
else
{
fiasInstallationManagerService.AddInstallation(new FIASVersionInstallation()
{
Id = Guid.NewGuid(),
FIASVersionId = newFIASVersion.Id,
StatusId = FIASVersionInstallationStatus.New,
InstallationTypeId = FIASVersionInstallationType.Update,
Created = DateTime.UtcNow
});

await fiasInstallationManagerService.SaveAsync();
}

await fiasInstallationManagerService.SaveAsync();
await fiasMaintenanceService.CommitTransactionAsync();
}

await fiasMaintenanceService.CommitTransactionAsync();
_logger.LogInformation($"Окончание проверки версии ФИАС: {fiasActualDistributionInfo.VersionId}.");
}
}

Expand Down

0 comments on commit 761f589

Please sign in to comment.