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

Processing fixes

Browse Source
This commit is contained in:
Michał Zieliski
2024-06-05 12:18:20 +02:00
parent 4663a58c29
commit d8b0423a61
3 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ namespace WebAPI.dataProcessors
} }
else else
{ {
values.Add(""); values.Add("0");
} }
} }
ValueRange ValueRange = new ValueRange ValueRange ValueRange = new ValueRange
@@ -207,22 +207,34 @@ namespace WebAPI.dataProcessors
update.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; update.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
update.Execute(); update.Execute();
} }
// sum // sum
List<object> valuesSum = new List<object>(); List<object> valuesSum = new List<object>();
List<object> emptyRow = new List<object>();
string rowEmpty = (startRow + DateTime.UtcNow.Month + 1).ToString();
string rowSum = (startRow + DateTime.UtcNow.Month + 2).ToString(); string rowSum = (startRow + DateTime.UtcNow.Month + 2).ToString();
foreach (string code in codesRow) foreach (string code in codesRow)
{ {
Record? record = R1!.Records?.SingleOrDefault(x => x.Code == $"{code}13"); Record? record = R1!.Records?.SingleOrDefault(x => x.Code == $"{code}13");
emptyRow.Add("");
if (record != null) if (record != null)
{ {
valuesSum.Add(record.Value1!.Value); valuesSum.Add(record.Value1!.Value);
} }
else else
{ {
valuesSum.Add(""); valuesSum.Add("0");
} }
} }
// insert empty row before sum
ValueRange valueRangeEmpty = new ValueRange
{
Values = new List<IList<object>> { emptyRow }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateEmpty = googleSheetValues.Update(valueRangeEmpty, sheetId, $"{sheetName}!C{rowEmpty}:XZ{rowEmpty}");
updateEmpty.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateEmpty.Execute();
ValueRange ValueRangeSum = new ValueRange ValueRange ValueRangeSum = new ValueRange
{ {
Values = new List<IList<object>> { valuesSum } Values = new List<IList<object>> { valuesSum }

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

@@ -89,16 +89,18 @@ namespace WebAPI.dataProcessors
} }
List<Record> allRecords = dataSources.SelectMany(x => x.Records!).ToList(); List<Record> allRecords = dataSources.SelectMany(x => x.Records!).ToList();
foreach (Record baseRecord in dataSources.Last()?.Records!) List<string> baseCodess = allRecords.Select(x => x.Code!.Remove(0, 1)).Distinct().ToList();
foreach (string baseCode in baseCodess)
{ {
List<Record> codeRecords = allRecords.Where(x => List<Record> codeRecords = allRecords.Where(x =>
x.Code!.Substring(1) == baseRecord.Code!.Substring(1)) x.Code!.Substring(1) == baseCode)
.ToList(); .ToList();
Record processedRecord = new Record Record processedRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = $"9{baseRecord.Code!.Remove(0,1)}", Code = $"9{baseCode}",
CreatedAt = DateTime.UtcNow, CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow ModifiedAt = DateTime.UtcNow
}; };

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

@@ -107,21 +107,21 @@ namespace WebAPI.dataProcessors
List<Record> allRecords = dataSources List<Record> allRecords = dataSources
.SelectMany(x => x.Records!).ToList(); .SelectMany(x => x.Records!).ToList();
List<Record> allRecordsValidation = dataSources List<string> baseCodess = allRecords.Select(x => x.Code!.Remove(0, 1)).Distinct().ToList();
.SelectMany(x => x.Records!).ToList();
foreach (Record baseRecord in dataSources.Last()?.Records!) foreach (string baseCode in baseCodess)
{ {
List<Record> codeRecords = allRecords.Where(x => List<Record> codeRecords = allRecords.Where(x =>
x.Code!.Substring(1) == baseRecord.Code!.Substring(1)) x.Code!.Substring(1) == baseCode)
.ToList(); .ToList();
List<Record> codeRecordsValidation = allRecords.Where(x => List<Record> codeRecordsValidation = allRecords.Where(x =>
x.Code!.Substring(1) == baseRecord.Code!.Substring(1)) x.Code!.Substring(1) == baseCode)
.ToList(); .ToList();
Record processedRecord = new Record Record processedRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = $"9{baseRecord.Code!.Remove(0,1)}", Code = $"9{baseCode}",
CreatedAt = DateTime.UtcNow, CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow ModifiedAt = DateTime.UtcNow
}; };
@@ -138,7 +138,7 @@ namespace WebAPI.dataProcessors
ProcessHelper.getValue(processedRecord,i) != ProcessHelper.getValue(processedRecord,i) !=
ProcessHelper.getValue(validationRecord, i)) ProcessHelper.getValue(validationRecord, i))
{ {
throw new Exception($"ValidationError: Code {baseRecord.Code!}, " + throw new Exception($"ValidationError: Code {baseCode!}, " +
$"Value{i} ({ProcessHelper.getValue(processedRecord, i)} | " + $"Value{i} ({ProcessHelper.getValue(processedRecord, i)} | " +
$"{ProcessHelper.getValue(validationRecord, i)})"); $"{ProcessHelper.getValue(validationRecord, i)})");
} }