mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config all processors for using two digits month number.

Browse Source
This commit is contained in:
Michał Zieliński
2024-12-30 20:20:28 +01:00
parent fc0a08d927
commit 5ef9cf477e
11 changed files with 117 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebAPI/dataProcessors/t1.r1.old.processor.cs
View File

@@ -66,7 +66,7 @@ public class T1R1OldProcessor(
var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed &&
!x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/{monthCopy}-{source.Desc1}-T3")
x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T3")
)
.Include(x => x.Records)
.FirstOrDefault();
@@ -81,7 +81,7 @@ public class T1R1OldProcessor(
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
LogType = LogType.Process,
Message = $"Data source {year}/{month}-{source.Desc1}-T3 not found",
Message = $"Data source {year}/{month:D2}-{source.Desc1}-T3 not found",
CreatedAt = DateTime.UtcNow
});
}

12
WebAPI/dataProcessors/t1.r1.processor.cs
View File

@@ -71,7 +71,7 @@ public class T1R1Processor(
var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed &&
!x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/{monthCopy}-{source.Desc1}-T3")
x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T3")
).Include(x => x.Records)
.FirstOrDefault();
@@ -159,7 +159,7 @@ public class T1R1Processor(
newRecords.AddRange(records.Select(x => new Record
{
Id = Guid.NewGuid(),
Code = x.Code + month.ToString("D2"),
Code = $"{x.Code}{month:D2}",
CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow,
Value1 = x.Value32
@@ -194,8 +194,6 @@ public class T1R1Processor(
.Include(x => x.Records)
.FirstOrDefault();
const int startRow = 6;
var codesRow = response.Values[0];
var valueRange = new ValueRange
@@ -206,11 +204,9 @@ public class T1R1Processor(
for (var i = 1; i <= 12; i++)
{
var values = new List<object>();
var month = i < 10 ? $"0{i}" : i.ToString();
var row = (startRow + i).ToString();
foreach (string code in codesRow)
{
var record = r1!.Records?.SingleOrDefault(x => x.Code == $"{code}{month}");
var record = r1!.Records?.SingleOrDefault(x => x.Code == $"{code}{i:D2}");
if (record != null)
{
values.Add(record.Value1!.Value);
@@ -226,8 +222,6 @@ public class T1R1Processor(
// sum
var valuesSum = new List<object>();
var emptyRow = new List<object>();
var rowEmpty = (startRow + 13).ToString();
var rowSum = (startRow + 14).ToString();
foreach (string code in codesRow)
{
var record = r1!.Records?.SingleOrDefault(x => x.Code == $"{code}13");

6
WebAPI/dataProcessors/t1.r3.processor.cs
View File

@@ -56,9 +56,9 @@ public class T1R3Processor(
string pattern = @$"^L\d+-P-{year}/\d+-{source}-T5$";
var dataSources = db.Layers
.Where(x => !x.IsDeleted)
.Include(layer => layer.Records!) // Filter on the database side as much as possible
.AsEnumerable() // Switch to in-memory evaluation
.Where(x => Regex.IsMatch(x.Name!, pattern)) // Apply Regex filtering
.Include(layer => layer.Records!)
.AsEnumerable()
.Where(x => Regex.IsMatch(x.Name!, pattern))
.ToList();
foreach (var dataSource in dataSources)

31
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs
View File

@@ -5,19 +5,10 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T3MultiSourceCopySelectedCodesProcessor
public class T3MultiSourceCopySelectedCodesProcessor(
AppDbContext db,
LayersController controller)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
public T3MultiSourceCopySelectedCodesProcessor(
AppDbContext db,
LayersController controller)
{
_db = db;
_controller = controller;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
@@ -35,7 +26,7 @@ public class T3MultiSourceCopySelectedCodesProcessor
var codesList = ProcessHelper.ParseCodes(codes);
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -50,9 +41,9 @@ public class T3MultiSourceCopySelectedCodesProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month}-AB-T3";
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month:D2}-AB-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow;
@@ -62,7 +53,7 @@ public class T3MultiSourceCopySelectedCodesProcessor
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedAt = DateTime.UtcNow;
var dataSources = sources.Select(source => _db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month}-{source.Desc1}-T3"))
var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3"))
.Include(x => x.Records)
.FirstOrDefault())
.OfType<Layer>()
@@ -94,13 +85,13 @@ public class T3MultiSourceCopySelectedCodesProcessor
.ToList();
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
}
else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

33
WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodesYearSummary.processor.cs
View File

@@ -5,24 +5,15 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T3MultiSourceCopySelectedCodesYearSummaryProcessor
public class T3MultiSourceCopySelectedCodesYearSummaryProcessor(
AppDbContext db,
LayersController controller)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
public T3MultiSourceCopySelectedCodesYearSummaryProcessor(
AppDbContext db,
LayersController controller)
{
_db = db;
_controller = controller;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -37,7 +28,7 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/13-AB-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -55,11 +46,11 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor
for (var i = 1; i < 13; i++)
{
var i1 = i;
var dataSource = _db.Layers.Where(x =>
var j = i;
var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed
&& !x.IsDeleted
&& x.Name != null && x.Name.Contains($"{year}/{i1}-AB-T3"))
&& x.Name != null && x.Name.Contains($"{year}/{j:D2}-AB-T3"))
.Include(x => x.Records)
.FirstOrDefault();
if (dataSource != null)
@@ -96,14 +87,14 @@ public class T3MultiSourceCopySelectedCodesYearSummaryProcessor
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
}
else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

43
WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs
View File

@@ -6,22 +6,11 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T3MultiSourceSummaryProcessor
public class T3MultiSourceSummaryProcessor(
AppDbContext db,
LayersController controller,
LogsController logsController)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
private readonly LogsController _logsController;
public T3MultiSourceSummaryProcessor(
AppDbContext db,
LayersController controller,
LogsController logsController)
{
_db = db;
_controller = controller;
_logsController = logsController;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
@@ -32,7 +21,7 @@ public class T3MultiSourceSummaryProcessor
throw new Exception("Source record not found");
}
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -47,9 +36,9 @@ public class T3MultiSourceSummaryProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month}-AA-T3";
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month:D2}-AA-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow;
@@ -61,7 +50,7 @@ public class T3MultiSourceSummaryProcessor
var newRecords = new List<Record>();
var dataSources = sources.Select(source => _db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month}-{source.Desc1}-T3"))
var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/{month:D2}-{source.Desc1}-T3"))
.Include(x => x.Records)
.FirstOrDefault())
.OfType<Layer>()
@@ -108,7 +97,7 @@ public class T3MultiSourceSummaryProcessor
{
if (dynamicCode.Desc1 == null)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -121,7 +110,7 @@ public class T3MultiSourceSummaryProcessor
var calc = new BaseCalc(dynamicCode.Desc1);
if (!calc.IsFormulaCorrect())
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -138,7 +127,7 @@ public class T3MultiSourceSummaryProcessor
}
catch (Exception e)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -150,7 +139,7 @@ public class T3MultiSourceSummaryProcessor
}
catch (Exception e)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -165,13 +154,13 @@ public class T3MultiSourceSummaryProcessor
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
}
else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

41
WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs
View File

@@ -6,22 +6,11 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T3MultiSourceYearSummaryProcessor
public class T3MultiSourceYearSummaryProcessor(
AppDbContext db,
LayersController controller,
LogsController logsController)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
private readonly LogsController _logsController;
public T3MultiSourceYearSummaryProcessor(
AppDbContext db,
LayersController controller,
LogsController logsController)
{
_db = db;
_controller = controller;
_logsController = logsController;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
@@ -31,7 +20,7 @@ public class T3MultiSourceYearSummaryProcessor
throw new Exception("Source record not found");
}
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -46,7 +35,7 @@ public class T3MultiSourceYearSummaryProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/13-AA-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -60,7 +49,7 @@ public class T3MultiSourceYearSummaryProcessor
var newRecords = new List<Record>();
var dataSources = sources.Select(source => _db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3"))
var dataSources = sources.Select(source => db.Layers.Where(x => x.Type == LayerType.Processed && !x.IsDeleted && x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3"))
.Include(x => x.Records)
.FirstOrDefault())
.OfType<Layer>()
@@ -130,7 +119,7 @@ public class T3MultiSourceYearSummaryProcessor
{
if (dynamicCode.Desc1 == null)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -143,7 +132,7 @@ public class T3MultiSourceYearSummaryProcessor
var calc = new BaseCalc(dynamicCode.Desc1);
if (!calc.IsFormulaCorrect())
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -160,7 +149,7 @@ public class T3MultiSourceYearSummaryProcessor
}
catch (Exception e)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -172,7 +161,7 @@ public class T3MultiSourceYearSummaryProcessor
}
catch (Exception e)
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -185,13 +174,13 @@ public class T3MultiSourceYearSummaryProcessor
}
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
}
else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

2
WebAPI/dataProcessors/t3.SingleSource.processor.cs
View File

@@ -45,7 +45,7 @@ public class T3SingleSourceProcessor(
ParentId = processWorker.Id,
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month}-{source}-T3";
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month:D2}-{source}-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow;

34
WebAPI/dataProcessors/t3.SourceYearSummary.processor.cs
View File

@@ -5,20 +5,10 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T3SourceYearSummaryProcessor
public class T3SourceYearSummaryProcessor(
AppDbContext db,
LayersController controller)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
public T3SourceYearSummaryProcessor(
AppDbContext db,
LayersController controller
)
{
_db = db;
_controller = controller;
}
public void Process(Layer processWorker)
{
var year = processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1;
@@ -27,7 +17,7 @@ public class T3SourceYearSummaryProcessor
{
throw new Exception("Source record not found");
}
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -42,7 +32,7 @@ public class T3SourceYearSummaryProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/13-{source}-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -59,11 +49,11 @@ public class T3SourceYearSummaryProcessor
var dataSources = new List<Layer>();
for (var i=1; i<13; i++)
{
var i1 = i;
var dataSource = _db.Layers.Where(x =>
var j = i;
var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed
&& !x.IsDeleted
&& x.Name!=null && x.Name.Contains($"{year}/{i1}-{source}-T3"))
&& x.Name!=null && x.Name.Contains($"{year}/{j:D2}-{source}-T3"))
.Include(x => x.Records)
.FirstOrDefault();
if (dataSource != null)
@@ -99,12 +89,12 @@ public class T3SourceYearSummaryProcessor
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
} else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

33
WebAPI/dataProcessors/t4.SingleSource.processor.cs
View File

@@ -4,19 +4,10 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T4SingleSourceProcessor
public class T4SingleSourceProcessor(
AppDbContext db,
LayersController controller)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
public T4SingleSourceProcessor(
AppDbContext db,
LayersController controller)
{
_db = db;
_controller = controller;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
@@ -26,7 +17,7 @@ public class T4SingleSourceProcessor
{
throw new Exception("SourceLayer record not found");
}
var sourceImportWorker = _db.Layers.SingleOrDefault(x => x.Name == sourceLayer);
var sourceImportWorker = db.Layers.SingleOrDefault(x => x.Name == sourceLayer);
if (sourceImportWorker == null)
{
throw new Exception("SourceImportWorkerL layer not found");
@@ -37,7 +28,7 @@ public class T4SingleSourceProcessor
throw new Exception("Source record not found");
}
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id)
.OrderByDescending(x => x.CreatedAt)
.FirstOrDefault();
@@ -51,9 +42,9 @@ public class T4SingleSourceProcessor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month}-{source}-T4";
processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month:D2}-{source}-T4";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.CreatedAt = DateTime.UtcNow;
@@ -64,7 +55,7 @@ public class T4SingleSourceProcessor
processedLayer.ModifiedAt = DateTime.UtcNow;
var dataSource = _db.Layers
var dataSource = db.Layers
.Include(x => x.Records)
.Where(x => x.ParentId == sourceImportWorker.Id
&& !x.IsDeleted)
@@ -89,13 +80,13 @@ public class T4SingleSourceProcessor
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
} else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
}
}

74
WebAPI/dataProcessors/t4.r2.processor.cs
View File

@@ -9,26 +9,12 @@ using WebAPI.Models;
namespace WebAPI.dataProcessors;
public class T4R2Processor
public class T4R2Processor(
AppDbContext db,
LayersController controller,
LogsController logsController,
SpreadsheetsResource.ValuesResource googleSheetValues)
{
private readonly AppDbContext _db;
private readonly LayersController _controller;
private readonly LogsController _logsController;
private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
public T4R2Processor(
AppDbContext db,
LayersController controller,
LogsController logsController,
SpreadsheetsResource.ValuesResource googleSheetValues
)
{
_db = db;
_controller = controller;
_logsController = logsController;
_googleSheetValues = googleSheetValues;
}
public void Process(Layer processWorker)
{
var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
@@ -45,7 +31,7 @@ public class T4R2Processor
}
var processedLayer = _db.Layers
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt)
@@ -60,7 +46,7 @@ public class T4R2Processor
Id = Guid.NewGuid(),
Type = LayerType.Processed,
ParentId = processWorker.Id,
Number = _db.Layers.Count() + 1
Number = db.Layers.Count() + 1
};
processedLayer.Name = $"L{processedLayer.Number}-{layerName}";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -85,17 +71,17 @@ public class T4R2Processor
sourceCodes = ProcessHelper.ParseCodes(rawSourceCodes);
}
List<string> lastSourceCodes = new List<string>();
List<string> lastSourceCodes = [];
for (var month = 1; month <= 12; month++)
{
if (month <= DateTime.UtcNow.Month)
{
var monthCopy = month;
var dataSource = _db.Layers.Where(x =>
var dataSource = db.Layers.Where(x =>
x.Type == LayerType.Processed &&
!x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/{monthCopy}-{source.Desc1}-T")
x.Name != null && x.Name.Contains($"{year}/{monthCopy:D2}-{source.Desc1}-T")
)
.Include(x => x.Records)
.FirstOrDefault();
@@ -109,7 +95,7 @@ public class T4R2Processor
var newRecord = new Record
{
Id = Guid.NewGuid(),
Code = x.Code + month.ToString("D2"),
Code = $"{x.Code}{month:D2}",
CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow,
Value1 = source.Desc1 != "FK2" ? x.Value32 : x.Value1,
@@ -122,12 +108,12 @@ public class T4R2Processor
}
else
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
LogType = LogType.Process,
Message = $"Data source {year}/{month}-{source.Desc1}-T3 not found",
Message = $"Data source {year}/{month:D2}-{source.Desc1}-T3 not found",
CreatedAt = DateTime.UtcNow
});
}
@@ -143,7 +129,7 @@ public class T4R2Processor
var newRecord = new Record
{
Id = Guid.NewGuid(),
Code = x + month.ToString("D2"),
Code = $"{x}{month:D2}",
CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow,
Value1 = 0,
@@ -156,7 +142,7 @@ public class T4R2Processor
}
// year summary
var dataSourceSum = _db.Layers.Where(x =>
var dataSourceSum = db.Layers.Where(x =>
x.Type == LayerType.Processed &&
!x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T")
@@ -172,7 +158,7 @@ public class T4R2Processor
var newRecord = new Record
{
Id = Guid.NewGuid(),
Code = x.Code + "13",
Code = $"{x.Code}13",
CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow,
Value1 = x.Value32
@@ -184,7 +170,7 @@ public class T4R2Processor
}
else
{
_logsController.AddEntry(new LogEntry
logsController.AddEntry(new LogEntry
{
Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.Warning,
@@ -197,15 +183,15 @@ public class T4R2Processor
if (isNew)
{
_db.Layers.Add(processedLayer);
db.Layers.Add(processedLayer);
}
else
{
_db.Layers.Update(processedLayer);
db.Layers.Update(processedLayer);
}
_controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
_db.SaveChanges();
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges();
UpdateReport();
}
@@ -215,10 +201,10 @@ public class T4R2Processor
const string sheetId = "1FsUmk_YRIeeGzFCX9tuUJCaLyRtjutX2ZGAEU1DMfJQ";
const string reportSheetName = "Raport_R2_Sprzedaz";
const string invoicesSheetName = "Raport_R2_Faktury";
var request = _googleSheetValues.Get(sheetId, "C4:Z4");
var request = googleSheetValues.Get(sheetId, "C4:Z4");
var response = request.Execute();
var r2 = _db.Layers
var r2 = db.Layers
.Where(x => x.Number == 1501)
.Include(x => x.Records)
.FirstOrDefault();
@@ -247,7 +233,7 @@ public class T4R2Processor
{
Values = new List<IList<object>> { values }
};
var update = _googleSheetValues.Update(valueRange, sheetId, $"{reportSheetName}!C{row}:XZ{row}");
var update = googleSheetValues.Update(valueRange, sheetId, $"{reportSheetName}!C{row}:XZ{row}");
update.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
update.Execute();
}
@@ -275,7 +261,7 @@ public class T4R2Processor
{
Values = new List<IList<object>> { emptyRow }
};
var updateEmpty = _googleSheetValues.Update(valueRangeEmpty, sheetId, $"{reportSheetName}!C{rowEmpty}:XZ{rowEmpty}");
var updateEmpty = googleSheetValues.Update(valueRangeEmpty, sheetId, $"{reportSheetName}!C{rowEmpty}:XZ{rowEmpty}");
updateEmpty.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateEmpty.Execute();
@@ -283,7 +269,7 @@ public class T4R2Processor
{
Values = new List<IList<object>> { valuesSum }
};
var updateSum = _googleSheetValues.Update(valueRangeSum, sheetId, $"{reportSheetName}!C{rowSum}:XZ{rowSum}");
var updateSum = googleSheetValues.Update(valueRangeSum, sheetId, $"{reportSheetName}!C{rowSum}:XZ{rowSum}");
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateSum.Execute();
@@ -296,7 +282,7 @@ public class T4R2Processor
{
Values = new List<IList<object>> { timeUtc }
};
var updateTimeUtc = _googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{reportSheetName}!G1");
var updateTimeUtc = googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{reportSheetName}!G1");
updateTimeUtc.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateTimeUtc.Execute();
@@ -310,7 +296,7 @@ public class T4R2Processor
{
Values = new List<IList<object>> { timeWarsaw }
};
var updateTimeWarsaw = _googleSheetValues.Update(valueRangeWarsawTime, sheetId, $"{reportSheetName}!G2");
var updateTimeWarsaw = googleSheetValues.Update(valueRangeWarsawTime, sheetId, $"{reportSheetName}!G2");
updateTimeWarsaw.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateTimeWarsaw.Execute();
@@ -344,14 +330,14 @@ public class T4R2Processor
var cleanupValueRange = new ValueRange { Values = cleanUpValues };
var cleanupInvoices = _googleSheetValues.Update(cleanupValueRange, sheetId, $"{invoicesSheetName}!A6:E");
var cleanupInvoices = googleSheetValues.Update(cleanupValueRange, sheetId, $"{invoicesSheetName}!A6:E");
cleanupInvoices.ValueInputOption =
SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
cleanupInvoices.Execute();
var invoicesValueRange = new ValueRange { Values = invoicesValues };
var updateInvoices = _googleSheetValues.Update(invoicesValueRange, sheetId, $"{invoicesSheetName}!A6:E");
var updateInvoices = googleSheetValues.Update(invoicesValueRange, sheetId, $"{invoicesSheetName}!A6:E");
updateInvoices.ValueInputOption =
SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateInvoices.Execute();