From 0be0ce4b1c1a2c0b13afa4e37d48d0f4747ef8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Thu, 31 Aug 2023 16:54:04 +0200 Subject: [PATCH] Write into empty log fix --- Utils/SQL_HELPERS.sql | 126 ++++++++++++------------- WebAPI/Controllers/LayersController.cs | 2 +- WebAPI/Controllers/LogsController.cs | 5 +- 3 files changed, 68 insertions(+), 65 deletions(-) diff --git a/Utils/SQL_HELPERS.sql b/Utils/SQL_HELPERS.sql index 1a2f760..ed51488 100644 --- a/Utils/SQL_HELPERS.sql +++ b/Utils/SQL_HELPERS.sql @@ -1,63 +1,63 @@ -INSERT INTO [diunabi-morska].[dbo].[Layers] -([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], -[CreatedById], [ModifiedById], [Type]) -VALUES ('1d4ad0b1-2a36-413d-838d-881b2f7cc8dc', 10, 'Manual', 'L10-A-IW_K5-2023/09-202308311601', -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 ('023e12dc-600e-412d-a9ff-29c14718393d', 'StartDate', '2023.08.30', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('023e12dc-600e-412d-a9ff-29c14718393d', 'EndDate', '2023.10.05', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('3a5210ad-c05b-4f65-9240-42cff94eed35', 'Source', 'GoogleSheet', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('0e32e97c-48c8-4a7d-a347-2319b996445b', 'SheetTabName', 'Wrzesien_2023', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('cfe52024-4125-4d52-9d90-59d88d104e73', 'SheetId', '1ZzndU8HjYqz5VKCcrVHBOFW8fqpYfwquclznX9q39Yk', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('d88dfe38-bfeb-4bd4-895b-71f58b4b7698', 'DataRange', 'C4:AR5', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('6c02ac13-c40f-4da6-b4b2-95be17499b13', 'ImportName', 'C3', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('9e922a00-490e-42cb-a9ac-633ce8ad58e7', 'ImportMonth', 'E3', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('eeef1970-9eaf-4f81-a54f-8ae8c6283e0b', 'ImportYear', 'D3', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('b8be15fd-d844-448c-b10a-2dcbe1384dbb', 'CheckSum', 'F3', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -INSERT INTO [diunabi-morska].[dbo].[Records] -([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ('ec2222da-71dd-43f5-9d28-dae2db1c51bc', 'Type', 'ImportWorker', -GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); - -DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = '411a8bc0-bac1-4790-16ba-08dbaa2f658e'; -DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = '411a8bc0-bac1-4790-16ba-08dbaa2f658e'; +--INSERT INTO [diunabi-morska].[dbo].[Layers] +--([Id], [Number], [Source], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], +--[CreatedById], [ModifiedById], [Type]) +--VALUES ('1d4ad0b1-2a36-413d-838d-881b2f7cc8dc', 10, 'Manual', 'L10-A-IW_K5-2023/09-202308311601', +--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 ('85e1ceeb-3e3c-4848-8227-f7366f26ab5c', 'StartDate', '2023.08.30', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('023e12dc-600e-412d-a9ff-29c14718393d', 'EndDate', '2023.10.05', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('3a5210ad-c05b-4f65-9240-42cff94eed35', 'Source', 'GoogleSheet', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('0e32e97c-48c8-4a7d-a347-2319b996445b', 'SheetTabName', 'Wrzesien_2023', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('cfe52024-4125-4d52-9d90-59d88d104e73', 'SheetId', '1ZzndU8HjYqz5VKCcrVHBOFW8fqpYfwquclznX9q39Yk', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('d88dfe38-bfeb-4bd4-895b-71f58b4b7698', 'DataRange', 'C4:AR5', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('6c02ac13-c40f-4da6-b4b2-95be17499b13', 'ImportName', 'C3', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('9e922a00-490e-42cb-a9ac-633ce8ad58e7', 'ImportMonth', 'E3', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('eeef1970-9eaf-4f81-a54f-8ae8c6283e0b', 'ImportYear', 'D3', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('b8be15fd-d844-448c-b10a-2dcbe1384dbb', 'CheckSum', 'F3', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +--INSERT INTO [diunabi-morska].[dbo].[Records] +--([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +--VALUES ('ec2222da-71dd-43f5-9d28-dae2db1c51bc', 'Type', 'ImportWorker', +--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); +-- +-- DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = '18815a17-89e9-45d2-16bb-08dbaa2f658e'; +-- DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = '18815a17-89e9-45d2-16bb-08dbaa2f658e'; diff --git a/WebAPI/Controllers/LayersController.cs b/WebAPI/Controllers/LayersController.cs index 90a3d44..773240d 100644 --- a/WebAPI/Controllers/LayersController.cs +++ b/WebAPI/Controllers/LayersController.cs @@ -289,7 +289,7 @@ namespace WebAPI.Controllers layer.Records.Add(record); }; } - AddLayer(layer, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); + //AddLayer(layer, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); logsController.AddEntry(new LogEntry { Title = $"Import Success, {importWorker.Name}", diff --git a/WebAPI/Controllers/LogsController.cs b/WebAPI/Controllers/LogsController.cs index f19e12a..2e12bcf 100644 --- a/WebAPI/Controllers/LogsController.cs +++ b/WebAPI/Controllers/LogsController.cs @@ -35,7 +35,10 @@ namespace WebAPI.Controllers } var response = googleSheetValues.Get(configuration["appLogsFile"], $"{type}!A:A").Execute(); var data = response.Values; - int row = data.Count + 1; + int row = 1; + if (data != null) { + row = data.Count + 1; + } var range = $"{type}!A{row}:D{row}"; List logRow = new List