From 760ce84fdf7bfb201d02f1cc6166a1e57f1179d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Sun, 29 Oct 2023 11:55:23 +0100 Subject: [PATCH] Update processed layer name --- Utils/SQL_HELPERS.sql | 145 ++++++++++-------- WebAPI/dataProcessors/copy.processor.cs | 2 +- .../dataProcessors/deaggregation.processor.cs | 2 +- 3 files changed, 81 insertions(+), 68 deletions(-) diff --git a/Utils/SQL_HELPERS.sql b/Utils/SQL_HELPERS.sql index 6c32126..dcc69b3 100644 --- a/Utils/SQL_HELPERS.sql +++ b/Utils/SQL_HELPERS.sql @@ -1,75 +1,87 @@ ---INSERT INTO [diunabi-morska].[dbo].[Layers] ---([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], ---[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', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('608af36d-6a01-454f-94dc-1ac549f84d5f', 'EndDate', '2023.11.05', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('d839d2d7-d655-4fef-b690-e58ee96e5d8c', 'Source', 'GoogleSheet', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('0be4c79e-31d4-4542-99f0-a053d5cf36e1', 'SheetTabName', 'Pazdziernik_2023', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('6bdf8b46-cb77-4b7c-a647-3236992ad2bd', 'SheetId', '1gnJhqdlL622GOJEuAiVzxJu1N1ZlSb4a-JvGB1rwHAo', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('a8cf688f-7996-4dda-8ede-4c0d57067684', 'DataRange', 'D4:AS5', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('56b2eec0-6aec-499f-b1bc-d4967a51191e', 'ImportName', 'D3', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('0b08633b-9857-404b-9b47-ae0d79e2e9d7', 'ImportMonth', 'F3', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('44a34bf2-f870-4d64-82db-4d7071ddffe5', 'ImportYear', 'E3', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('c6ac4715-a4ad-464a-9597-7e6a4fdc5208', 'CheckSum', 'G3', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '2cadf61e-2653-4cda-aaef-d59e9e4c1c26'); --- ---INSERT INTO [diunabi-morska].[dbo].[Records] ---([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ---VALUES ('eb79a132-dd99-4e97-b3ba-5e2544bc921c', 'Type', 'ImportWorker', ---GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --- - +-- REMOVE LAYER --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'; +-- ADD IMPORT LAYER --DECLARE @LayerId UNIQUEIDENTIFIER; ---SET @LayerId = '306654d6-cdab-4fbb-b7f7-312093a0f178'; +--SET @LayerId = '92ee1732-3900-4a8e-bb78-9bdc00332dd3'; +-- +--INSERT INTO [diunabi-morska].[dbo].[Layers] +--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], +--[CreatedById], [ModifiedById], [Type]) +--VALUES ((SELECT @LayerId), 183, 'Manual', 'L183-A-IW_M7-2023/11-202310291127', +--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', 'L83-A-IW_M7-2023/10-202310031937', +--VALUES ((SELECT NEWID()), 'StartDate', '2023.10.29', +--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()), 'EndDate', '2023.12.05', +--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', 'GoogleSheet', +--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()), 'SheetTabName', 'Listopad_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()), 'SheetId', '1epk7AdNNvTyN4TKIIOqan-h5A8HYGbRVM_OS-Ns-Qlg', +--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()), 'DataRange', 'D4:BM5', +--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()), 'ImportName', 'D3', +--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()), 'ImportMonth', 'F3', +--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()), 'ImportYear', 'E3', +--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()), 'CheckSum', 'G3', +--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', 'ImportWorker', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); +-- +-- +-- ADD PROCESS LAYER +--DECLARE @LayerId UNIQUEIDENTIFIER; +--SET @LayerId = '171d25ce-7dde-4c84-8062-3e18d62c49fc'; +-- +--INSERT INTO [diunabi-morska].[dbo].[Layers] +--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], +--[CreatedById], [ModifiedById], [Type]) +--VALUES ((SELECT @LayerId), 189, 'Manual', 'L189-A-PW_M7-2023/11-202311291149', +--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', 'L183-A-IW_M7-2023/11-202310291127', --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); -- --INSERT INTO [diunabi-morska].[dbo].[Records] @@ -79,5 +91,6 @@ -- --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 +--VALUES ((SELECT NEWID()), 'ProcessType', 'Deaggregation', +--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/copy.processor.cs b/WebAPI/dataProcessors/copy.processor.cs index 4ef0c04..dfcfd45 100644 --- a/WebAPI/dataProcessors/copy.processor.cs +++ b/WebAPI/dataProcessors/copy.processor.cs @@ -88,7 +88,7 @@ namespace WebAPI.dataProcessors ParentId = parentId, Number = db.Layers.Count() + 1, }; - processedLayer.Name = $"L{processedLayer.Number}-P-{name}-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm")}"; + processedLayer.Name = $"L{processedLayer.Number}-P-{year}/{month}-{name}-T1"; processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedAt = DateTime.UtcNow; diff --git a/WebAPI/dataProcessors/deaggregation.processor.cs b/WebAPI/dataProcessors/deaggregation.processor.cs index 22aabd2..3e2801d 100644 --- a/WebAPI/dataProcessors/deaggregation.processor.cs +++ b/WebAPI/dataProcessors/deaggregation.processor.cs @@ -88,7 +88,7 @@ namespace WebAPI.dataProcessors ParentId = parentId, Number = db.Layers.Count() + 1, }; - processedLayer.Name = $"L{processedLayer.Number}-P-{name}-{year}/{month}-{DateTime.Now.ToString("yyyyMMddHHmm")}"; + processedLayer.Name = $"L{processedLayer.Number}-P-{name}-{year}/{month}-{name}-T2"; processedLayer.CreatedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.ModifiedById = Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"); processedLayer.CreatedAt = DateTime.UtcNow;