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

WIP: refactor

Browse Source
This commit is contained in:
Michał Zieliski
2024-06-18 19:53:52 +02:00
parent a0a228f86d
commit 7e8406dc9b
10 changed files with 245 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebAPI/Calculators/BaseCalc.cs
View File

@@ -62,7 +62,7 @@ public class BaseCalc
for (var i = 1; i <= 32; i++) for (var i = 1; i <= 32; i++)
{ {
var formula = ingredients.Aggregate(Formula, (current, ingredient) => current.Replace($"[{ingredient.Code}]", ProcessHelper.getValue(ingredient, i)?.ToString(CultureInfo.InvariantCulture))); var formula = ingredients.Aggregate(Formula, (current, ingredient) => current.Replace($"[{ingredient.Code}]", ProcessHelper.GetValue(ingredient, i)?.ToString(CultureInfo.InvariantCulture)));
if (formula.Contains('[')) if (formula.Contains('['))
{ {
throw new Exception($"Not all placeholders were replaced. Value{i} [{formula}]"); throw new Exception($"Not all placeholders were replaced. Value{i} [{formula}]");

6
WebAPI/Controllers/AdminController.cs
View File

@@ -16,12 +16,12 @@ public class AdminController : Controller
public AdminController( public AdminController(
GoogleDriveHelper googleDriveHelper, GoogleDriveHelper googleDriveHelper,
IConfiguration configuration, GoogleSheetsHelper googleSheetsHelper,
LogsController logsController) IConfiguration configuration)
{ {
_googleDriveHelper = googleDriveHelper; _googleDriveHelper = googleDriveHelper;
_configuration = configuration; _configuration = configuration;
_logsController = logsController; _logsController = new LogsController(googleSheetsHelper, _configuration);
} }
[HttpGet] [HttpGet]

4
WebAPI/Controllers/LayersController.cs
View File

@@ -493,7 +493,7 @@ public class LayersController : Controller
case "T1-R1": case "T1-R1":
{ {
var processor = new T1R1Processor(_db, _googleSheetValues, this, _logsController); var processor = new T1R1Processor(_db, _googleSheetValues, this, _logsController);
processor.process(processWorker); processor.Process(processWorker);
_logsController.AddEntry(new LogEntry _logsController.AddEntry(new LogEntry
{ {
@@ -553,7 +553,7 @@ public class LayersController : Controller
{ {
var t3MultiSourceCopySelectedCode = var t3MultiSourceCopySelectedCode =
new T3MultiSourceCopySelectedCodesProcessor(_db, _googleSheetValues, this); new T3MultiSourceCopySelectedCodesProcessor(_db, _googleSheetValues, this);
t3MultiSourceCopySelectedCode.process(processWorker); t3MultiSourceCopySelectedCode.Process(processWorker);
break; break;
} }
} }

4
WebAPI/dataProcessors/ProcessHelper.cs
View File

@@ -107,7 +107,7 @@ public static class ProcessHelper
break; break;
} }
} }
public static double? getValue(Record record, int number) public static double? GetValue(Record record, int number)
{ {
return number switch return number switch
{ {
@@ -159,7 +159,7 @@ public static class ProcessHelper
break; break;
case 2: case 2:
{ {
for (int i = int.Parse(range[0]); i <= int.Parse(range[1]); i++) for (var i = int.Parse(range[0]); i <= int.Parse(range[1]); i++)
{ {
codesList.Add(i); codesList.Add(i);
} }

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

@@ -6,49 +6,49 @@ using Microsoft.EntityFrameworkCore;
using WebAPI.Controllers; using WebAPI.Controllers;
using WebAPI.Models; using WebAPI.Models;
namespace WebAPI.dataProcessors namespace WebAPI.dataProcessors;
{
public class T1R1Processor public class T1R1Processor
{ {
private readonly AppDbContext db; private readonly AppDbContext _db;
private readonly SpreadsheetsResource.ValuesResource googleSheetValues; private readonly SpreadsheetsResource.ValuesResource _googleSheetValues;
private readonly LayersController controller; private readonly LayersController _controller;
private readonly LogsController logsController; private readonly LogsController _logsController;
public T1R1Processor( public T1R1Processor(
AppDbContext _db, AppDbContext db,
SpreadsheetsResource.ValuesResource _googleSheetValues, SpreadsheetsResource.ValuesResource googleSheetValues,
LayersController _controller, LayersController controller,
LogsController _logsController) LogsController logsController)
{ {
db = _db; _db = db;
googleSheetValues = _googleSheetValues; _googleSheetValues = googleSheetValues;
controller = _controller; _controller = controller;
logsController = _logsController; _logsController = logsController;
} }
public void process(Layer processWorker) public void Process(Layer processWorker)
{ {
int year = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!); var year = int.Parse(processWorker.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
List<Record>? sources = processWorker.Records?.Where(x => x.Code == "Source").ToList(); var sources = processWorker.Records?.Where(x => x.Code == "Source").ToList();
if (sources!.Count() == 0) if (!sources!.Any())
{ {
throw new Exception("Source record not found"); throw new Exception("Source record not found");
} }
string? codes = processWorker.Records?.SingleOrDefault(x => x.Code == "Codes")?.Desc1; var codes = processWorker.Records?.SingleOrDefault(x => x.Code == "Codes")?.Desc1;
if (codes == null) if (codes == null)
{ {
throw new Exception("Codes record not found"); throw new Exception("Codes record not found");
} }
List<int> codesList = ProcessHelper.ParseCodes(codes); var codesList = ProcessHelper.ParseCodes(codes);
Layer? processedLayer = db.Layers var processedLayer = _db.Layers
.Where(x => x.ParentId == processWorker!.Id .Where(x => x.ParentId == processWorker.Id
&& !x.IsDeleted) && !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
bool isNew = false; var isNew = false;
if (processedLayer == null) if (processedLayer == null)
{ {
isNew = true; isNew = true;
@@ -57,8 +57,8 @@ namespace WebAPI.dataProcessors
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Source = "", Source = "",
Type = LayerType.processed, Type = LayerType.processed,
ParentId = processWorker!.Id, ParentId = processWorker.Id,
Number = db.Layers.Count() + 1, Number = _db.Layers.Count() + 1
}; };
processedLayer.Name = $"L{processedLayer.Number}-P-{year}-R1-T1"; processedLayer.Name = $"L{processedLayer.Number}-P-{year}-R1-T1";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -70,16 +70,17 @@ namespace WebAPI.dataProcessors
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow;
List<Layer> dataSources = new List<Layer>(); var dataSources = new List<Layer>();
foreach (Record source in sources!) foreach (var source in sources!)
{ {
for (int month = 1; month <= DateTime.UtcNow.Month; month++) for (var month = 1; month <= DateTime.UtcNow.Month; month++)
{ {
Layer? dataSource = db.Layers.Where(x => var monthCopy = month;
var dataSource = _db.Layers.Where(x =>
x.Type == LayerType.processed && x.Type == LayerType.processed &&
!x.IsDeleted && !x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/{month}-{source.Desc1}-T3") x.Name != null && x.Name.Contains($"{year}/{monthCopy}-{source.Desc1}-T3")
) )
.Include(x => x.Records) .Include(x => x.Records)
.FirstOrDefault(); .FirstOrDefault();
@@ -89,9 +90,9 @@ namespace WebAPI.dataProcessors
} }
else else
{ {
logsController.AddEntry(new LogEntry _logsController.AddEntry(new LogEntry
{ {
Title = $"{processWorker!.Name}, {processWorker.Id}", Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.warning, Type = LogEntryType.warning,
LogType = LogType.process, LogType = LogType.process,
Message = $"Data source {year}/{month}-{source.Desc1}-T3 not found", Message = $"Data source {year}/{month}-{source.Desc1}-T3 not found",
@@ -100,7 +101,7 @@ namespace WebAPI.dataProcessors
} }
} }
// year summary // year summary
Layer? dataSourceSum = db.Layers.Where(x => var dataSourceSum = _db.Layers.Where(x =>
x.Type == LayerType.processed && x.Type == LayerType.processed &&
!x.IsDeleted && !x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3") x.Name != null && x.Name.Contains($"{year}/13-{source.Desc1}-T3")
@@ -113,9 +114,9 @@ namespace WebAPI.dataProcessors
} }
else else
{ {
logsController.AddEntry(new LogEntry _logsController.AddEntry(new LogEntry
{ {
Title = $"{processWorker!.Name}, {processWorker.Id}", Title = $"{processWorker.Name}, {processWorker.Id}",
Type = LogEntryType.warning, Type = LogEntryType.warning,
LogType = LogType.process, LogType = LogType.process,
Message = $"Data source {year}/13-{source.Desc1}-T3 not found", Message = $"Data source {year}/13-{source.Desc1}-T3 not found",
@@ -127,22 +128,22 @@ namespace WebAPI.dataProcessors
if (dataSources.Count == 0) if (dataSources.Count == 0)
{ {
throw new Exception($"DataSources are empty"); throw new Exception("DataSources are empty");
} }
List<Record> newRecords = dataSources var newRecords = dataSources
.SelectMany(x => x.Records!) .SelectMany(x => x.Records!)
.Where(x => codesList.Contains(int.Parse(x.Code!))) .Where(x => codesList.Contains(int.Parse(x.Code!)))
.Select(x => .Select(x =>
{ {
Layer? layer = dataSources.SingleOrDefault(y => y.Id == x.LayerId); var layer = dataSources.SingleOrDefault(y => y.Id == x.LayerId);
string postFix = layer!.Name!.Split("/")[1].Split("-")[0]; var postFix = layer!.Name!.Split("/")[1].Split("-")[0];
if (postFix.Length == 1) if (postFix.Length == 1)
{ {
postFix = "0" + postFix; postFix = "0" + postFix;
} }
Record newRecord = new Record var newRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = x.Code + postFix, Code = x.Code + postFix,
@@ -156,41 +157,41 @@ namespace WebAPI.dataProcessors
.ToList(); .ToList();
if (isNew) if (isNew)
{ {
db.Layers.Add(processedLayer); _db.Layers.Add(processedLayer);
} }
else else
{ {
db.Layers.Update(processedLayer); _db.Layers.Update(processedLayer);
} }
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); _controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges(); _db.SaveChanges();
updateReport(); UpdateReport();
} }
public void updateReport() private void UpdateReport()
{ {
string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA"; const string sheetId = "1pph-XowjlK5CIaCEV_A5buK4ceJ0Z0YoUlDI4VMkhhA";
string sheetName = "Raport_R1_Eksport"; const string sheetName = "Raport_R1_Eksport";
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:EX4"); var request = _googleSheetValues.Get(sheetId, "C4:EX4");
var response = request.Execute(); var response = request.Execute();
Layer? R1 = db.Layers var r1 = _db.Layers
.Where(x => x.Number == 1205) .Where(x => x.Number == 1205)
.Include(x => x.Records) .Include(x => x.Records)
.FirstOrDefault(); .FirstOrDefault();
int startRow = 6; const int startRow = 6;
var codesRow = response.Values[0]; var codesRow = response.Values[0];
for (int i = 1; i <= DateTime.UtcNow.Month; i++) for (var i = 1; i <= DateTime.UtcNow.Month; i++)
{ {
List<object> values = new List<object>(); var values = new List<object>();
string month = i < 10 ? $"0{i}" : i.ToString(); var month = i < 10 ? $"0{i}" : i.ToString();
string row = (startRow + i).ToString(); var row = (startRow + i).ToString();
foreach (string code in codesRow) foreach (string code in codesRow)
{ {
Record? record = R1!.Records?.SingleOrDefault(x => x.Code == $"{code}{month}"); var record = r1!.Records?.SingleOrDefault(x => x.Code == $"{code}{month}");
if (record != null) if (record != null)
{ {
values.Add(record.Value1!.Value); values.Add(record.Value1!.Value);
@@ -200,23 +201,23 @@ namespace WebAPI.dataProcessors
values.Add("0"); values.Add("0");
} }
} }
ValueRange ValueRange = new ValueRange var valueRange = new ValueRange
{ {
Values = new List<IList<object>> { values } Values = new List<IList<object>> { values }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest update = googleSheetValues.Update(ValueRange, sheetId, $"{sheetName}!C{row}:XZ{row}"); var update = _googleSheetValues.Update(valueRange, sheetId, $"{sheetName}!C{row}:XZ{row}");
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>(); var valuesSum = new List<object>();
List<object> emptyRow = new List<object>(); var emptyRow = new List<object>();
string rowEmpty = (startRow + DateTime.UtcNow.Month + 1).ToString(); var rowEmpty = (startRow + DateTime.UtcNow.Month + 1).ToString();
string rowSum = (startRow + DateTime.UtcNow.Month + 2).ToString(); var 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"); var record = r1!.Records?.SingleOrDefault(x => x.Code == $"{code}13");
emptyRow.Add(""); emptyRow.Add("");
if (record != null) if (record != null)
{ {
@@ -228,48 +229,47 @@ namespace WebAPI.dataProcessors
} }
} }
// insert empty row before sum // insert empty row before sum
ValueRange valueRangeEmpty = new ValueRange var valueRangeEmpty = new ValueRange
{ {
Values = new List<IList<object>> { emptyRow } Values = new List<IList<object>> { emptyRow }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateEmpty = googleSheetValues.Update(valueRangeEmpty, sheetId, $"{sheetName}!C{rowEmpty}:XZ{rowEmpty}"); var updateEmpty = _googleSheetValues.Update(valueRangeEmpty, sheetId, $"{sheetName}!C{rowEmpty}:XZ{rowEmpty}");
updateEmpty.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateEmpty.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateEmpty.Execute(); updateEmpty.Execute();
ValueRange ValueRangeSum = new ValueRange var valueRangeSum = new ValueRange
{ {
Values = new List<IList<object>> { valuesSum } Values = new List<IList<object>> { valuesSum }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateSum = googleSheetValues.Update(ValueRangeSum, sheetId, $"{sheetName}!C{rowSum}:XZ{rowSum}"); var updateSum = _googleSheetValues.Update(valueRangeSum, sheetId, $"{sheetName}!C{rowSum}:XZ{rowSum}");
updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateSum.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateSum.Execute(); updateSum.Execute();
// update time // update time
List<object> timeUtc = new List<object> var timeUtc = new List<object>
{ {
R1!.ModifiedAt.ToString(CultureInfo.InvariantCulture), r1!.ModifiedAt.ToString(CultureInfo.InvariantCulture)
}; };
ValueRange valueRangeUtcTime = new ValueRange var valueRangeUtcTime = new ValueRange
{ {
Values = new List<IList<object>> { timeUtc } Values = new List<IList<object>> { timeUtc }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateTimeUtc = googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{sheetName}!G1"); var updateTimeUtc = _googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{sheetName}!G1");
updateTimeUtc.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateTimeUtc.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateTimeUtc.Execute(); updateTimeUtc.Execute();
var warsawTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Central European Standard Time"); var warsawTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Central European Standard Time");
var warsawTime = TimeZoneInfo.ConvertTimeFromUtc(R1!.ModifiedAt.ToUniversalTime(), warsawTimeZone); var warsawTime = TimeZoneInfo.ConvertTimeFromUtc(r1.ModifiedAt.ToUniversalTime(), warsawTimeZone);
List<object> timeWarsaw = new List<object> var timeWarsaw = new List<object>
{ {
warsawTime.ToString(CultureInfo.InvariantCulture), warsawTime.ToString(CultureInfo.InvariantCulture)
}; };
ValueRange valueRangeWarsawTime = new ValueRange var valueRangeWarsawTime = new ValueRange
{ {
Values = new List<IList<object>> { timeWarsaw } Values = new List<IList<object>> { timeWarsaw }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateTimeWarsaw = googleSheetValues.Update(valueRangeWarsawTime, sheetId, $"{sheetName}!G2"); var updateTimeWarsaw = _googleSheetValues.Update(valueRangeWarsawTime, sheetId, $"{sheetName}!G2");
updateTimeWarsaw.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateTimeWarsaw.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateTimeWarsaw.Execute(); updateTimeWarsaw.Execute();
} }
} }
}

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

@@ -23,30 +23,30 @@ namespace WebAPI.dataProcessors
controller = _controller; controller = _controller;
} }
public void process(Layer processWorker) public void Process(Layer processWorker)
{ {
int year = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!); var year = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Year")?.Desc1!);
int month = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Month")?.Desc1!); var month = int.Parse(processWorker!.Records?.SingleOrDefault(x => x.Code == "Month")?.Desc1!);
List<Record>? sources = processWorker.Records?.Where(x => x.Code == "Source").ToList(); var sources = processWorker.Records?.Where(x => x.Code == "Source").ToList();
if (sources!.Count() == 0) if (!sources!.Any())
{ {
throw new Exception("Source record not found"); throw new Exception("Source record not found");
} }
string? codes = processWorker.Records?.SingleOrDefault(x => x.Code == "Codes")?.Desc1; var codes = processWorker.Records?.SingleOrDefault(x => x.Code == "Codes")?.Desc1;
if (codes == null) if (codes == null)
{ {
throw new Exception("Codes record not found"); throw new Exception("Codes record not found");
} }
// create array of integers from string codes where: '501-503;505-505;510-512' -> [501,502,503,505,510,511,512]
List<int> codesList = ProcessHelper.ParseCodes(codes);
Layer? processedLayer = db.Layers var codesList = ProcessHelper.ParseCodes(codes);
var processedLayer = db.Layers
.Where(x => x.ParentId == processWorker!.Id .Where(x => x.ParentId == processWorker!.Id
&& !x.IsDeleted) && !x.IsDeleted)
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.FirstOrDefault(); .FirstOrDefault();
bool isNew = false; var isNew = false;
if (processedLayer == null) if (processedLayer == null)
{ {
isNew = true; isNew = true;
@@ -56,7 +56,7 @@ namespace WebAPI.dataProcessors
Source = "", Source = "",
Type = LayerType.processed, Type = LayerType.processed,
ParentId = processWorker!.Id, 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}-AB-T3";
processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
@@ -68,33 +68,23 @@ namespace WebAPI.dataProcessors
processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D");
processedLayer.ModifiedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow;
List<Layer> dataSources = new List<Layer>(); 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"))
foreach (Record source in sources!)
{
Layer? dataSource = db.Layers.Where(x =>
x.Type == LayerType.processed &&
!x.IsDeleted &&
x.Name != null && x.Name.Contains($"{year}/{month}-{source.Desc1}-T3")
)
.Include(x => x.Records) .Include(x => x.Records)
.FirstOrDefault(); .FirstOrDefault())
if (dataSource != null) .OfType<Layer>()
{ .ToList();
dataSources.Add(dataSource);
}
}
if (dataSources.Count == 0) if (dataSources.Count == 0)
{ {
throw new Exception($"DataSources are empty"); throw new Exception($"DataSources are empty");
} }
List<Record> newRecords = dataSources var newRecords = dataSources
.SelectMany(x => x.Records!) .SelectMany(x => x.Records!)
.Where(x => codesList.Contains(int.Parse(x.Code!))) .Where(x => codesList.Contains(int.Parse(x.Code!)))
.Select(x => .Select(x =>
{ {
Record newRecord = new Record var newRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = x.Code, Code = x.Code,
@@ -103,7 +93,7 @@ namespace WebAPI.dataProcessors
}; };
for (var i = 1; i < 33; i++) for (var i = 1; i < 33; i++)
{ {
ProcessHelper.SetValue(newRecord, i, ProcessHelper.getValue(x, i)); ProcessHelper.SetValue(newRecord, i, ProcessHelper.GetValue(x, i));
} }
return newRecord; return newRecord;
}) })

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

@@ -94,7 +94,7 @@ namespace WebAPI.dataProcessors
for (var i = 1; i < 33; i++) for (var i = 1; i < 33; i++)
{ {
ProcessHelper.SetValue(processedRecord, i, ProcessHelper.SetValue(processedRecord, i,
codeRecords.Sum(x => ProcessHelper.getValue(x, i))); codeRecords.Sum(x => ProcessHelper.GetValue(x, i)));
} }
newRecords.Add(processedRecord); newRecords.Add(processedRecord);

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

@@ -107,7 +107,7 @@ namespace WebAPI.dataProcessors
for (var i = 1; i<33; i++) for (var i = 1; i<33; i++)
{ {
ProcessHelper.SetValue(processedRecord, i, ProcessHelper.SetValue(processedRecord, i,
codeRecords.Sum(x => ProcessHelper.getValue(x, i))); codeRecords.Sum(x => ProcessHelper.GetValue(x, i)));
} }
newRecords.Add(processedRecord); newRecords.Add(processedRecord);
} }

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

@@ -129,18 +129,18 @@ namespace WebAPI.dataProcessors
for (var i = 1; i < 33; i++) for (var i = 1; i < 33; i++)
{ {
ProcessHelper.SetValue(processedRecord, i, ProcessHelper.SetValue(processedRecord, i,
codeRecords.Sum(x => ProcessHelper.getValue(x, i))); codeRecords.Sum(x => ProcessHelper.GetValue(x, i)));
ProcessHelper.SetValue(validationRecord, i, ProcessHelper.SetValue(validationRecord, i,
codeRecordsValidation.Sum(x => ProcessHelper.getValue(x, i))); codeRecordsValidation.Sum(x => ProcessHelper.GetValue(x, i)));
if ( if (
ProcessHelper.getValue(processedRecord,i) != ProcessHelper.GetValue(processedRecord,i) !=
ProcessHelper.getValue(validationRecord, i)) ProcessHelper.GetValue(validationRecord, i))
{ {
throw new Exception($"ValidationError: Code {baseCode!}, " + 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)})");
} }
} }
newRecords.Add(processedRecord); newRecords.Add(processedRecord);

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

@@ -96,7 +96,7 @@ namespace WebAPI.dataProcessors
for (var i = 1; i < 33; i++) for (var i = 1; i < 33; i++)
{ {
ProcessHelper.SetValue(processedRecord, i, ProcessHelper.SetValue(processedRecord, i,
codeRecords.Sum(x => ProcessHelper.getValue(x, i))); codeRecords.Sum(x => ProcessHelper.GetValue(x, i)));
} }
newRecords.Add(processedRecord); newRecords.Add(processedRecord);
} }