From 7804a39ea56431c7194a230a1002e17797b917d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Mon, 1 Jan 2024 17:40:55 +0100 Subject: [PATCH] Adjust process workers for new codes --- Utils/SQL_HELPERS.sql | 123 +++++++++--------- ....MultiSourceCopySelectedCodes.processor.cs | 47 ++++++- .../t3.MultiSourceSummary.processor.cs | 2 +- .../t3.MultiSourceYearSummary.processor.cs | 2 +- 4 files changed, 107 insertions(+), 67 deletions(-) diff --git a/Utils/SQL_HELPERS.sql b/Utils/SQL_HELPERS.sql index 6476103..5595e11 100644 --- a/Utils/SQL_HELPERS.sql +++ b/Utils/SQL_HELPERS.sql @@ -70,64 +70,69 @@ --VALUES ((SELECT NEWID()), 'Type', 'ImportWorker', --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 -DECLARE @LayerId UNIQUEIDENTIFIER; -SET @LayerId = 'c433afde-5ca9-422a-9434-7985839dd414'; - -INSERT INTO [diunabi-morska].[dbo].[Layers] -([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], -[CreatedById], [ModifiedById], [Type]) -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); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ((SELECT NEWID()), 'Source', 'K5', -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()), 'Source', 'M7', -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()), 'Source', 'PU', -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()), 'Source', 'FK', -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()), 'Type', 'ProcessWorker', -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()), 'ProcessType', 'T3-MultiSourceSummarySelectedCodes', -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)); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ((SELECT NEWID()), 'Year', '2023', -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()), 'Month', '11', -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()), '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)); +--DECLARE @LayerId UNIQUEIDENTIFIER; +--SET @LayerId = 'c433afde-5ca9-422a-9434-7985839dd414'; +-- +--INSERT INTO [diunabi-morska].[dbo].[Layers] +--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], +--[CreatedById], [ModifiedById], [Type]) +--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); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ((SELECT NEWID()), 'Source', 'K5', +--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()), 'Source', 'M7', +--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()), 'Source', 'PU', +--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()), 'Source', 'FK', +--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()), 'Type', 'ProcessWorker', +--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()), 'ProcessType', 'T3-MultiSourceSummarySelectedCodes', +--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)); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ((SELECT NEWID()), 'Year', '2023', +--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()), 'Month', '11', +--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()), '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', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); +-- \ No newline at end of file diff --git a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs index 9aa9b70..bef6762 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceCopySelectedCodes.processor.cs @@ -127,6 +127,9 @@ namespace WebAPI.dataProcessors // load google spreadsheet with sheetId SpreadsheetsResource.ValuesResource.GetRequest request = googleSheetValues.Get(sheetId, "C4:CH4"); var response = request.Execute(); + SpreadsheetsResource.ValuesResource.GetRequest request2 = googleSheetValues.Get(sheetId, "C6:CH6"); + var response2 = request2.Execute(); + Layer? november = db.Layers .Where(x => x.Number == 491) .Include(x => x.Records) @@ -137,8 +140,14 @@ namespace WebAPI.dataProcessors .Include(x => x.Records) .FirstOrDefault(); + Layer? january = db.Layers + .Where(x => x.Number == 572) + .Include(x => x.Records) + .FirstOrDefault(); + List novemberValues = new List(); List decemberValues = new List(); + List januaryValues = new List(); var codesRow = response.Values[0]; foreach (string code in codesRow) @@ -149,22 +158,24 @@ namespace WebAPI.dataProcessors { float? novemberValue = ProcessHelper.getValue(novemberRecord, 32); novemberValues.Add(novemberValue!.Value); - } else { + } + else + { novemberValues.Add(""); } if (decemberRecord != null) { float? decemberValue = ProcessHelper.getValue(decemberRecord, 32); decemberValues.Add(decemberValue!.Value); - } else { + } + else + { decemberValues.Add(""); } } - - ValueRange novemberValueRange = new ValueRange { - Values = new List> { novemberValues } + Values = new List> { novemberValues } }; SpreadsheetsResource.ValuesResource.UpdateRequest updateNovember = googleSheetValues.Update(novemberValueRange, sheetId, $"{sheetName}!C10:CH10"); updateNovember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; @@ -172,11 +183,35 @@ namespace WebAPI.dataProcessors ValueRange decemberValueRange = new ValueRange { - Values = new List> { decemberValues } + Values = new List> { decemberValues } }; SpreadsheetsResource.ValuesResource.UpdateRequest updateDecember = googleSheetValues.Update(decemberValueRange, sheetId, $"{sheetName}!C11:CH11"); updateDecember.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED; 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> { 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) diff --git a/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs index 465ec60..63b56f2 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceSummary.processor.cs @@ -94,7 +94,7 @@ namespace WebAPI.dataProcessors Record processedRecord = new Record { Id = Guid.NewGuid(), - Code = $"9{baseRecord.Code!.Substring(1)}", + Code = $"9{baseRecord.Code!.Remove(0,1)}", CreatedAt = DateTime.UtcNow, ModifiedAt = DateTime.UtcNow }; diff --git a/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs b/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs index ffa0166..720af95 100644 --- a/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs +++ b/WebAPI/dataProcessors/t3.MultiSourceYearSummary.processor.cs @@ -117,7 +117,7 @@ namespace WebAPI.dataProcessors Record processedRecord = new Record { 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, ModifiedAt = DateTime.UtcNow };