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

AutoImport: DataVaidation FIX

Browse Source
This commit is contained in:
Michał Zieliński
2023-10-02 21:14:15 +02:00
parent f70ba9b701
commit f22b1933df
2 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Utils/SQL_HELPERS.sql
View File

@@ -1,63 +1,62 @@
--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 ('1d4ad0b1-2a36-413d-838d-881b2f7cc8dc', 10, 'Manual', 'L10-A-IW_K5-2023/09-202308311601', --VALUES ('f43e69f8-b89a-4502-963d-8c1a381a0422', 78, 'Manual', 'L77-A-IW_K5-2023/10-202310021927',
--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 ('85e1ceeb-3e3c-4848-8227-f7366f26ab5c', 'StartDate', '2023.08.30', --VALUES ('f43e69f8-b89a-4502-963d-8c1a381a0422', 'StartDate', '2023.09.30',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('023e12dc-600e-412d-a9ff-29c14718393d', 'EndDate', '2023.10.05', --VALUES ('f37eb334-8ca2-4232-8809-064a6d1cfadd', 'EndDate', '2023.11.05',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('3a5210ad-c05b-4f65-9240-42cff94eed35', 'Source', 'GoogleSheet', --VALUES ('069bc419-3baa-4a2a-a115-0afc9c4c4cb1', 'Source', 'GoogleSheet',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('0e32e97c-48c8-4a7d-a347-2319b996445b', 'SheetTabName', 'Wrzesien_2023', --VALUES ('47862b96-1a05-4426-9c67-4e575edeb4b0', 'SheetTabName', 'Pazdziernik_2023',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('cfe52024-4125-4d52-9d90-59d88d104e73', 'SheetId', '1ZzndU8HjYqz5VKCcrVHBOFW8fqpYfwquclznX9q39Yk', --VALUES ('d478ba86-5943-462c-8103-3e1b4c10c2e3', 'SheetId', '1ZzndU8HjYqz5VKCcrVHBOFW8fqpYfwquclznX9q39Yk',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('d88dfe38-bfeb-4bd4-895b-71f58b4b7698', 'DataRange', 'C4:AR5', --VALUES ('f2161c73-9386-461e-b71b-88ac5178438a', 'DataRange', 'C4:AR5',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('6c02ac13-c40f-4da6-b4b2-95be17499b13', 'ImportName', 'C3', --VALUES ('52e1e356-0129-4c70-8cb2-195a867f02b9', 'ImportName', 'C3',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('9e922a00-490e-42cb-a9ac-633ce8ad58e7', 'ImportMonth', 'E3', --VALUES ('5380f086-b5a2-4c27-98cd-a0a0e8f57779', 'ImportMonth', 'E3',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('eeef1970-9eaf-4f81-a54f-8ae8c6283e0b', 'ImportYear', 'D3', --VALUES ('90cd358e-a67d-44d8-b2e1-ce15f305050b', 'ImportYear', 'D3',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('b8be15fd-d844-448c-b10a-2dcbe1384dbb', 'CheckSum', 'F3', --VALUES ('d8446dd7-a4ca-48b0-81a3-0abc23fe0525', 'CheckSum', 'F3',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, 'f43e69f8-b89a-4502-963d-8c1a381a0422');
-- --
--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 ('ec2222da-71dd-43f5-9d28-dae2db1c51bc', 'Type', 'ImportWorker', --VALUES ('c59d2c84-05a2-4a0d-b7a2-5bd9accb342e', 'Type', 'ImportWorker',
--GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, '1d4ad0b1-2a36-413d-838d-881b2f7cc8dc'); --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] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1';
-- DELETE FROM [diunabi-morska].[dbo].[Records] WHERE [LayerId] = '18815a17-89e9-45d2-16bb-08dbaa2f658e'; --DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = 'bb4cc1ae-a94e-424d-9aa3-08dbba1c92b1';
-- DELETE FROM [diunabi-morska].[dbo].[Layers] WHERE [Id] = '18815a17-89e9-45d2-16bb-08dbaa2f658e';

7
WebAPI/Controllers/LayersController.cs
View File

@@ -305,7 +305,7 @@ namespace WebAPI.Controllers
throw new Exception($"SheetId not found, {importWorker.Name}"); throw new Exception($"SheetId not found, {importWorker.Name}");
} }
string? sheetTabName = importWorker.Records!.Where(x => x.Code == "SheetTabName").FirstOrDefault()?.Desc1; string? sheetTabName = importWorker.Records!.Where(x => x.Code == "SheetTabName").FirstOrDefault()?.Desc1;
if (sheetId == null) if (sheetTabName == null)
{ {
throw new Exception($"SheetTabName not found, {importWorker.Name}"); throw new Exception($"SheetTabName not found, {importWorker.Name}");
} }
@@ -336,7 +336,7 @@ namespace WebAPI.Controllers
} }
// open excel and read data // open excel and read data
var nameResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{importNameCell}:{importNameCell}").Execute(); var nameResponse = googleSheetValues.Get(sheetId, $"{sheetTabName}!{importNameCell}:{importNameCell}").Execute();
string? name = nameResponse.Values[0][0].ToString(); string? name = nameResponse.Values?[0][0].ToString();
if (name == null) if (name == null)
{ {
throw new Exception($"ImportName cell is empty, {importWorker.Name}"); throw new Exception($"ImportName cell is empty, {importWorker.Name}");
@@ -382,7 +382,9 @@ namespace WebAPI.Controllers
layer.Records.Add(record); 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 logsController.AddEntry(new LogEntry
{ {
Title = $"Import Success, {importWorker.Name}", Title = $"Import Success, {importWorker.Name}",
@@ -390,6 +392,7 @@ namespace WebAPI.Controllers
LogType = LogType.import, LogType = LogType.import,
CreatedAt = DateTime.UtcNow CreatedAt = DateTime.UtcNow
}); });
} }
private Layer AddLayer(Layer input, Guid currentUserId) private Layer AddLayer(Layer input, Guid currentUserId)
{ {