From 759f55cc2f989e209ca8eaa2a89bbc9deb4b02b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Thu, 12 Oct 2023 18:08:00 +0200 Subject: [PATCH] ProcessorsFIX --- Utils/SQL_HELPERS.sql | 21 ++++++++++++++++++- WebAPI/DiunaBI-WebAPI.csproj | 10 ++++----- WebAPI/dataProcessors/copy.processor.cs | 10 ++++++++- .../dataProcessors/deaggregation.processor.cs | 11 ++++++++-- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/Utils/SQL_HELPERS.sql b/Utils/SQL_HELPERS.sql index adc9f70..6c32126 100644 --- a/Utils/SQL_HELPERS.sql +++ b/Utils/SQL_HELPERS.sql @@ -3,7 +3,7 @@ --[CreatedById], [ModifiedById], [Type]) --VALUES ('2cadf61e-2653-4cda-aaef-d59e9e4c1c26', 84, 'Manual', 'L84-A-IW_PU-2023/10-202310031948', --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 ('1e6b8736-5125-4c00-8da7-1bd7182ef49d', 'StartDate', '2023.09.30', @@ -62,3 +62,22 @@ --DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1'; --DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1'; + + +--DECLARE @LayerId UNIQUEIDENTIFIER; +--SET @LayerId = '306654d6-cdab-4fbb-b7f7-312093a0f178'; +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ((SELECT NEWID()), 'Source', 'L83-A-IW_M7-2023/10-202310031937', +--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', 'Copy', +--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/DiunaBI-WebAPI.csproj b/WebAPI/DiunaBI-WebAPI.csproj index ac22cba..555ed3b 100644 --- a/WebAPI/DiunaBI-WebAPI.csproj +++ b/WebAPI/DiunaBI-WebAPI.csproj @@ -9,13 +9,13 @@ - + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/WebAPI/dataProcessors/copy.processor.cs b/WebAPI/dataProcessors/copy.processor.cs index 5038140..a8e3dce 100644 --- a/WebAPI/dataProcessors/copy.processor.cs +++ b/WebAPI/dataProcessors/copy.processor.cs @@ -76,8 +76,10 @@ namespace WebAPI.dataProcessors .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); + bool isNew = false; if (processedLayer == null) { + isNew = true; processedLayer = new Layer { Id = Guid.NewGuid(), @@ -91,7 +93,6 @@ namespace WebAPI.dataProcessors processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow; - db.Layers.Add(processedLayer); } processedLayer.Records = new List(); @@ -126,6 +127,13 @@ namespace WebAPI.dataProcessors processedLayer.Records.Add(record); } controller.SaveRecords(processedLayer.Id, processedLayer.Records, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); + if (isNew) + { + db.Layers.Add(processedLayer); + } else + { + db.Layers.Update(processedLayer); + } db.Layers.Update(processedLayer); db.SaveChanges(); } diff --git a/WebAPI/dataProcessors/deaggregation.processor.cs b/WebAPI/dataProcessors/deaggregation.processor.cs index 5fd7ad8..73ad68b 100644 --- a/WebAPI/dataProcessors/deaggregation.processor.cs +++ b/WebAPI/dataProcessors/deaggregation.processor.cs @@ -76,8 +76,10 @@ namespace WebAPI.dataProcessors .OrderByDescending(x => x.CreatedAt) .FirstOrDefault(); + bool isNew = false; if (processedLayer == null) { + isNew = true; processedLayer = new Layer { Id = Guid.NewGuid(), @@ -91,7 +93,6 @@ namespace WebAPI.dataProcessors processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedAt = DateTime.UtcNow; processedLayer.ModifiedAt = DateTime.UtcNow; - db.Layers.Add(processedLayer); } processedLayer.Sources = new List(); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); @@ -177,7 +178,13 @@ namespace WebAPI.dataProcessors newRecords.Add(processedRecord); } controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); - db.Layers.Update(processedLayer); + if (isNew) + { + db.Layers.Add(processedLayer); + } else + { + db.Layers.Update(processedLayer); + } db.SaveChanges(); } private void setValue(Record record, int number, float? value)