Adjust processor type names
This commit is contained in:
@@ -7,13 +7,13 @@ using Google.Apis.Sheets.v4;
|
|||||||
|
|
||||||
namespace DiunaBI.Plugins.Morska.Processors;
|
namespace DiunaBI.Plugins.Morska.Processors;
|
||||||
|
|
||||||
public class T3SingleSourceProcessor : MorskaBaseProcessor
|
public class MorskaT3SingleSourceProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T3.SingleSource";
|
public override string ProcessorType => "Morska.Process.T3.SingleSource";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
private readonly ILogger<T3SingleSourceProcessor> _logger;
|
private readonly ILogger<MorskaT3SingleSourceProcessor> _logger;
|
||||||
|
|
||||||
// Configuration properties loaded from layer records
|
// Configuration properties loaded from layer records
|
||||||
private int Year { get; set; }
|
private int Year { get; set; }
|
||||||
@@ -22,10 +22,10 @@ public class T3SingleSourceProcessor : MorskaBaseProcessor
|
|||||||
private string? Source { get; set; }
|
private string? Source { get; set; }
|
||||||
private Layer? SourceImportWorker { get; set; }
|
private Layer? SourceImportWorker { get; set; }
|
||||||
|
|
||||||
public T3SingleSourceProcessor(
|
public MorskaT3SingleSourceProcessor(
|
||||||
AppDbContext db,
|
AppDbContext db,
|
||||||
SpreadsheetsResource.ValuesResource googleSheetValues,
|
SpreadsheetsResource.ValuesResource googleSheetValues,
|
||||||
ILogger<T3SingleSourceProcessor> logger)
|
ILogger<MorskaT3SingleSourceProcessor> logger)
|
||||||
{
|
{
|
||||||
_db = db;
|
_db = db;
|
||||||
_googleSheetValues = googleSheetValues;
|
_googleSheetValues = googleSheetValues;
|
||||||
@@ -12,7 +12,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T1R1Processor : MorskaBaseProcessor
|
public class T1R1Processor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T1.R1";
|
public override string ProcessorType => "Morska.Process.T1.R1";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T1R3Processor : MorskaBaseProcessor
|
public class T1R3Processor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T1.R3";
|
public override string ProcessorType => "Morska.Process.T1.R3";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T3MultiSourceSummaryProcessor : MorskaBaseProcessor
|
public class T3MultiSourceSummaryProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T3.MultiSourceSummary";
|
public override string ProcessorType => "Morska.Process.T3.MultiSourceSummary";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly ILogger<T3MultiSourceSummaryProcessor> _logger;
|
private readonly ILogger<T3MultiSourceSummaryProcessor> _logger;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T3MultiSourceYearSummaryProcessor : MorskaBaseProcessor
|
public class T3MultiSourceYearSummaryProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T3.MultiSourceYearSummary";
|
public override string ProcessorType => "Morska.Process.T3.MultiSourceYearSummary";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly ILogger<T3MultiSourceYearSummaryProcessor> _logger;
|
private readonly ILogger<T3MultiSourceYearSummaryProcessor> _logger;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T3SourceYearSummaryProcessor : MorskaBaseProcessor
|
public class T3SourceYearSummaryProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T3.SourceYearSummary";
|
public override string ProcessorType => "Morska.Process.T3.SourceYearSummary";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T4R2Processor : MorskaBaseProcessor
|
public class T4R2Processor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T4.R2";
|
public override string ProcessorType => "Morska.Process.T4.R2";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T4SingleSourceProcessor : MorskaBaseProcessor
|
public class T4SingleSourceProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T4.SingleSource";
|
public override string ProcessorType => "Morska.Process.T4.SingleSource";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ namespace DiunaBI.Plugins.Morska.Processors;
|
|||||||
|
|
||||||
public class T5LastValuesProcessor : MorskaBaseProcessor
|
public class T5LastValuesProcessor : MorskaBaseProcessor
|
||||||
{
|
{
|
||||||
public override string ProcessorType => "T5.LastValues";
|
public override string ProcessorType => "Morska.Process.T5.LastValues";
|
||||||
|
|
||||||
private readonly AppDbContext _db;
|
private readonly AppDbContext _db;
|
||||||
private readonly ILogger<T5LastValuesProcessor> _logger;
|
private readonly ILogger<T5LastValuesProcessor> _logger;
|
||||||
|
|||||||
@@ -757,31 +757,66 @@ public class LayersController : Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpGet]
|
||||||
|
[Route("CheckProcessors")]
|
||||||
|
[AllowAnonymous]
|
||||||
|
public IActionResult CheckProcessors()
|
||||||
|
{
|
||||||
|
// get list od all enabled processors and check if they has record 'Plugin'
|
||||||
|
var enabledProcessors = _db.Layers
|
||||||
|
.Include(x => x.Records)
|
||||||
|
.Where(x =>
|
||||||
|
x.Records!.Any(y => y.Code == "Type" && y.Desc1 == "ProcessWorker") &&
|
||||||
|
x.Records!.Any(y => y.Code == "IsEnabled" && y.Desc1 == "True")
|
||||||
|
)
|
||||||
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
|
.AsNoTracking()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
_logger.LogInformation("CheckProcessors: Found {ProcessorCount} enabled processors", enabledProcessors.Count);
|
||||||
|
foreach (var processor in enabledProcessors)
|
||||||
|
{
|
||||||
|
var pluginRecord = processor.Records!.FirstOrDefault(x => x.Code == "Plugin");
|
||||||
|
if (pluginRecord == null)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("CheckProcessors: No Plugin record found for processor {ProcessorName} ({ProcessorId}), skipping",
|
||||||
|
processor.Name, processor.Id);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var pluginName = pluginRecord.Desc1;
|
||||||
|
if (string.IsNullOrEmpty(pluginName))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("CheckProcessors: Empty Plugin name for processor {ProcessorName} ({ProcessorId}), skipping",
|
||||||
|
processor.Name, processor.Id);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var processorInstance = _pluginManager.GetProcessor(pluginName);
|
||||||
|
if (processorInstance == null)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("CheckProcessors: Processor {PluginName} not found for {ProcessorName} ({ProcessorId}), skipping",
|
||||||
|
pluginName, processor.Name, processor.Id);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_logger.LogInformation("CheckProcessors: Completed checking processors");
|
||||||
|
|
||||||
|
return Ok();
|
||||||
|
}
|
||||||
|
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
[Route("AddPluginName")]
|
[Route("AddPluginName")]
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public IActionResult AddPluginName()
|
public IActionResult AddPluginName()
|
||||||
{
|
{
|
||||||
var record = new Record
|
|
||||||
{
|
|
||||||
Id = Guid.NewGuid(),
|
|
||||||
LayerId = Guid.Parse("eb5b4d0e-1607-4445-bbe5-65b9b8416787"),
|
|
||||||
Code = "Plugin",
|
|
||||||
Desc1 = "Morska.Import.Standard",
|
|
||||||
CreatedAt = DateTime.UtcNow,
|
|
||||||
ModifiedAt = DateTime.UtcNow,
|
|
||||||
CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"),
|
|
||||||
ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")
|
|
||||||
};
|
|
||||||
_db.Records.Add(record);
|
|
||||||
_db.SaveChanges();
|
|
||||||
|
|
||||||
/*
|
|
||||||
var importWorkerLayers = _db.Layers
|
var importWorkerLayers = _db.Layers
|
||||||
.Include(x => x.Records)
|
.Include(x => x.Records)
|
||||||
.Where(x =>
|
.Where(x =>
|
||||||
x.Records!.Any(y => y.Code == "Type" && y.Desc1 == "ImportWorker") &&
|
x.Records!.Any(y => y.Code == "Type" && y.Desc1 == "ProcessWorker") &&
|
||||||
x.Records!.Any(y => y.Code == "ImportType" && y.Desc1 == "Import-D3")
|
x.Records!.Any(y => y.Code == "IsEnabled" && y.Desc1 == "True") &&
|
||||||
|
x.Records!.Any(y => y.Code == "ProcessType" && y.Desc1 == "T1-R3")
|
||||||
)
|
)
|
||||||
.OrderByDescending(x => x.CreatedAt)
|
.OrderByDescending(x => x.CreatedAt)
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
@@ -794,21 +829,20 @@ public class LayersController : Controller
|
|||||||
Id = Guid.NewGuid(),
|
Id = Guid.NewGuid(),
|
||||||
LayerId = importWorker.Id,
|
LayerId = importWorker.Id,
|
||||||
Code = "Plugin",
|
Code = "Plugin",
|
||||||
Desc1 = "Morska.Import.D3",
|
Desc1 = "Morska.Process.T1.R3",
|
||||||
CreatedAt = DateTime.UtcNow,
|
CreatedAt = DateTime.UtcNow,
|
||||||
ModifiedAt = DateTime.UtcNow,
|
ModifiedAt = DateTime.UtcNow,
|
||||||
CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"),
|
CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"),
|
||||||
ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")
|
ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")
|
||||||
};
|
};
|
||||||
//_db.Records.Add(record);
|
_db.Records.Add(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
//_db.SaveChanges();
|
_db.SaveChanges();
|
||||||
*/
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static void WriteToConsole(params string[] messages)
|
private static void WriteToConsole(params string[] messages)
|
||||||
{
|
{
|
||||||
foreach (var message in messages)
|
foreach (var message in messages)
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
###
|
###
|
||||||
GET http://localhost:5400/api/Layers/AutoProcess/10763478CB738D4ecb2h76g803478CB738D4e
|
GET http://localhost:5400/api/Layers/CheckProcessors
|
||||||
Timeout: 500000
|
Timeout: 500000
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
###
|
###
|
||||||
GET http://localhost:5400/api/Admin/BackupDatabase/10763478CB738D4ecb2h76g803478CB738D4e
|
GET http://localhost:5400/api/Layers/AddPluginName
|
||||||
|
|||||||
Reference in New Issue
Block a user