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

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();