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

Adjust process workers for new codes

Browse Source
This commit is contained in:
Michał Zieliński
2024-01-01 17:40:55 +01:00
parent 8ab34f0189
commit 7804a39ea5
4 changed files with 107 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
Utils/SQL_HELPERS.sql
View File

@@ -70,64 +70,69 @@
--VALUES ((SELECT NEWID()), 'Type', 'ImportWorker', --VALUES ((SELECT NEWID()), 'Type', 'ImportWorker',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
-- --
--INSERT INTO [diunabi-morska].[dbo].[Records]
--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
--VALUES ((SELECT NEWID()), 'IsEnabled', 'True',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
-- --
--ADD PROCESS LAYER --ADD PROCESS LAYER
DECLARE @LayerId UNIQUEIDENTIFIER; --DECLARE @LayerId UNIQUEIDENTIFIER;
SET @LayerId = 'c433afde-5ca9-422a-9434-7985839dd414'; --SET @LayerId = 'c433afde-5ca9-422a-9434-7985839dd414';
--
INSERT INTO [diunabi-morska].[dbo].[Layers] --INSERT INTO [diunabi-morska].[dbo].[Layers]
([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], --([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
[CreatedById], [ModifiedById], [Type]) --[CreatedById], [ModifiedById], [Type])
VALUES ((SELECT @LayerId), 490, 'Manual', 'L197-A-PW_AB-2023/11-202311201714', --VALUES ((SELECT @LayerId), 490, 'Manual', 'L197-A-PW_AB-2023/11-202311201714',
GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); --GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2);
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Source', 'K5', --VALUES ((SELECT NEWID()), 'Source', 'K5',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Source', 'M7', --VALUES ((SELECT NEWID()), 'Source', 'M7',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Source', 'PU', --VALUES ((SELECT NEWID()), 'Source', 'PU',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Source', 'FK', --VALUES ((SELECT NEWID()), 'Source', 'FK',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Type', 'ProcessWorker', --VALUES ((SELECT NEWID()), 'Type', 'ProcessWorker',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'ProcessType', 'T3-MultiSourceSummarySelectedCodes', --VALUES ((SELECT NEWID()), 'ProcessType', 'T3-MultiSourceSummarySelectedCodes',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'IsEnabled', 'True', --VALUES ((SELECT NEWID()), 'IsEnabled', 'True',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
INSERT INTO [diunabi-morska].[dbo].[Records] --INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Year', '2023', --VALUES ((SELECT NEWID()), 'Year', '2023',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
--
--INSERT INTO [diunabi-morska].[dbo].[Records]
INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --VALUES ((SELECT NEWID()), 'Month', '11',
VALUES ((SELECT NEWID()), 'Month', '11', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --
--INSERT INTO [diunabi-morska].[dbo].[Records]
INSERT INTO [diunabi-morska].[dbo].[Records] --([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) --VALUES ((SELECT NEWID()), 'Codes', '5000-5003;5005-5005;5081-5095;6000-6003;6005-6005;6081-6095;7000-7003;7005-7005;7081-7095;8000-8003;8005-8005;8081-8095',
VALUES ((SELECT NEWID()), 'Codes', '501-503;505-505;581-595;601-603;605-605;681-695;701-703;705-705;781-795;801-803;805-805;881-895', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); --

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

@@ -127,6 +127,9 @@ namespace WebAPI.dataProcessors
// load google spreadsheet with sheetId // load google spreadsheet with sheetId
SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:CH4"); SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:CH4");
var response = request.Execute(); var response = request.Execute();
SpreadsheetsResource.ValuesResource.GetRequest request2 = googleSheetValues.Get(sheetId, "C6:CH6");
var response2 = request2.Execute();
Layer? november = db.Layers Layer? november = db.Layers
.Where(x => x.Number == 491) .Where(x => x.Number == 491)
.Include(x => x.Records) .Include(x => x.Records)
@@ -137,8 +140,14 @@ namespace WebAPI.dataProcessors
.Include(x => x.Records) .Include(x => x.Records)
.FirstOrDefault(); .FirstOrDefault();
Layer? january = db.Layers
.Where(x => x.Number == 572)
.Include(x => x.Records)
.FirstOrDefault();
List<object> novemberValues = new List<object>(); List<object> novemberValues = new List<object>();
List<object> decemberValues = new List<object>(); List<object> decemberValues = new List<object>();
List<object> januaryValues = new List<object>();
var codesRow = response.Values[0]; var codesRow = response.Values[0];
foreach (string code in codesRow) foreach (string code in codesRow)
@@ -149,22 +158,24 @@ namespace WebAPI.dataProcessors
{ {
float? novemberValue = ProcessHelper.getValue(novemberRecord, 32); float? novemberValue = ProcessHelper.getValue(novemberRecord, 32);
novemberValues.Add(novemberValue!.Value); novemberValues.Add(novemberValue!.Value);
} else { }
else
{
novemberValues.Add(""); novemberValues.Add("");
} }
if (decemberRecord != null) if (decemberRecord != null)
{ {
float? decemberValue = ProcessHelper.getValue(decemberRecord, 32); float? decemberValue = ProcessHelper.getValue(decemberRecord, 32);
decemberValues.Add(decemberValue!.Value); decemberValues.Add(decemberValue!.Value);
} else { }
else
{
decemberValues.Add(""); decemberValues.Add("");
} }
} }
ValueRange novemberValueRange = new ValueRange ValueRange novemberValueRange = new ValueRange
{ {
Values = new List<IList<object>> { novemberValues } Values = new List<IList<object>> { novemberValues }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateNovember = googleSheetValues.Update(novemberValueRange, sheetId, $"{sheetName}!C10:CH10"); SpreadsheetsResource.ValuesResource.UpdateRequest updateNovember = googleSheetValues.Update(novemberValueRange, sheetId, $"{sheetName}!C10:CH10");
updateNovember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateNovember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
@@ -172,11 +183,35 @@ namespace WebAPI.dataProcessors
ValueRange decemberValueRange = new ValueRange ValueRange decemberValueRange = new ValueRange
{ {
Values = new List<IList<object>> { decemberValues } Values = new List<IList<object>> { decemberValues }
}; };
SpreadsheetsResource.ValuesResource.UpdateRequest updateDecember = googleSheetValues.Update(decemberValueRange, sheetId, $"{sheetName}!C11:CH11"); SpreadsheetsResource.ValuesResource.UpdateRequest updateDecember = googleSheetValues.Update(decemberValueRange, sheetId, $"{sheetName}!C11:CH11");
updateDecember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; updateDecember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateDecember.Execute(); updateDecember.Execute();
// 2024
var codesRow2 = response2.Values[0];
foreach (string code in codesRow2)
{
Record? januaryRecord = january!.Records?.SingleOrDefault(x => x.Code == code);
if (januaryRecord != null)
{
float? januaryValue = ProcessHelper.getValue(januaryRecord, 32);
januaryValues.Add(januaryValue!.Value);
}
else
{
januaryValues.Add("");
}
}
ValueRange januaryValueRange = new ValueRange
{
Values = new List<IList<object>> { januaryValues }
};
SpreadsheetsResource.ValuesResource.UpdateRequest updateJanuary = googleSheetValues.Update(januaryValueRange, sheetId, $"{sheetName}!C12:CH12");
updateJanuary.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
updateJanuary.Execute();
} }
private void updateCell(string sheetId, string range, float value) private void updateCell(string sheetId, string range, float value)

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

@@ -94,7 +94,7 @@ namespace WebAPI.dataProcessors
Record processedRecord = new Record Record processedRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = $"9{baseRecord.Code!.Substring(1)}", Code = $"9{baseRecord.Code!.Remove(0,1)}",
CreatedAt = DateTime.UtcNow, CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow ModifiedAt = DateTime.UtcNow
}; };

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

@@ -117,7 +117,7 @@ namespace WebAPI.dataProcessors
Record processedRecord = new Record Record processedRecord = new Record
{ {
Id = Guid.NewGuid(), Id = Guid.NewGuid(),
Code = $"19{baseRecord.Code!.Substring(Math.Max(0, baseRecord.Code!.Length - 2))}", Code = $"19{baseRecord.Code!.Remove(0,1)}",
CreatedAt = DateTime.UtcNow, CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow ModifiedAt = DateTime.UtcNow
}; };