From 75600a741553ece0961195e510eda1fd7325cd55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Fri, 4 Jul 2025 13:15:47 +0200 Subject: [PATCH] Add instance name to serilog --- src/Backend/DiunaBI.WebAPI/Program.cs | 3 ++- src/Backend/DiunaBI.WebAPI/appsettings.json | 1 + tools/http-tests/AutoImport.http | 2 +- .../admin-monthly/CreateImportWorker.sql | 14 +++++++------- ...eateProcessWorker-T3MultiSourceSummary-AA.sql | 12 ++++++++++-- .../CreateProcessWorker-T3SingleSource.sql | 14 +++++++++++--- .../CreateProcessWorker-T4SingleSource.sql | 10 +++++++++- tools/sql-scripts/utlis/CreateDictionary.sql | 16 +++++++++++----- 8 files changed, 52 insertions(+), 20 deletions(-) diff --git a/src/Backend/DiunaBI.WebAPI/Program.cs b/src/Backend/DiunaBI.WebAPI/Program.cs index 2df0db6..3864e1f 100644 --- a/src/Backend/DiunaBI.WebAPI/Program.cs +++ b/src/Backend/DiunaBI.WebAPI/Program.cs @@ -16,10 +16,11 @@ if (builder.Environment.IsProduction()) { builder.Host.UseSerilog((context, configuration) => { + var instanceName = context.Configuration["instanceName"] ?? "unknown"; configuration .ReadFrom.Configuration(context.Configuration) .Enrich.FromLogContext() - .Enrich.WithProperty("Application", "DiunaBI") + .Enrich.WithProperty("Application", $"DiunaBI-{instanceName}") .Enrich.WithProperty("Version", Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown") .Enrich.WithEnvironmentName() .Enrich.WithMachineName(); diff --git a/src/Backend/DiunaBI.WebAPI/appsettings.json b/src/Backend/DiunaBI.WebAPI/appsettings.json index 89147f0..011555c 100644 --- a/src/Backend/DiunaBI.WebAPI/appsettings.json +++ b/src/Backend/DiunaBI.WebAPI/appsettings.json @@ -49,6 +49,7 @@ "ConnectionStrings": { "SQLDatabase": "#{db-connection-string}#" }, + "InstanceName": "#{instance-name}", "GoogleClientId": "#{google-backend-login-client-id}#", "Secret": "#{google-backend-login-secret}#", "apiKey": "#{api-key}#", diff --git a/tools/http-tests/AutoImport.http b/tools/http-tests/AutoImport.http index d8cfd30..784b5ed 100644 --- a/tools/http-tests/AutoImport.http +++ b/tools/http-tests/AutoImport.http @@ -1,3 +1,3 @@ ### -GET http://localhost:5400/api/Layers/AutoImport/10763478CB738D4ecb2h76g803478CB738D4e/D1- +GET http://localhost:5400/api/Layers/AutoImport/10763478CB738D4ecb2h76g803478CB738D4e/K5- diff --git a/tools/sql-scripts/admin-monthly/CreateImportWorker.sql b/tools/sql-scripts/admin-monthly/CreateImportWorker.sql index 924dcab..9026c20 100644 --- a/tools/sql-scripts/admin-monthly/CreateImportWorker.sql +++ b/tools/sql-scripts/admin-monthly/CreateImportWorker.sql @@ -1,10 +1,10 @@ DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES -DECLARE @Type NVARCHAR(3) = 'D1'; -DECLARE @Month INT = 5; +DECLARE @Type NVARCHAR(3) = 'FK2'; +DECLARE @Month INT = 7; DECLARE @Year INT = 2025; -DECLARE @MonthName NVARCHAR(20) = 'Maj_2025'; +DECLARE @MonthName NVARCHAR(20) = 'Lipiec_2025'; IF @Type NOT IN ('K5', 'PU', 'AK', 'FK', 'D1', 'FK2') BEGIN @@ -53,10 +53,10 @@ END; DECLARE @Plugin NVARCHAR(100); SET @Plugin = CASE @Type - WHEN 'K5' THEN 'Morska.Process.T3.SingleSource' - WHEN 'PU' THEN 'Morska.Process.T3.SingleSource' - WHEN 'AK' THEN 'Morska.Process.T3.SingleSource' - WHEN 'FK' THEN 'Morska.Process.T3.SingleSource' + WHEN 'K5' THEN 'Morska.Import.Standard' + WHEN 'PU' THEN 'Morska.Import.Standard' + WHEN 'AK' THEN 'Morska.Import.Standard' + WHEN 'FK' THEN 'Morska.Import.Standard' WHEN 'D1' THEN 'Morska.Import.D1' WHEN 'FK2' THEN 'Morska.Import.FK2' ELSE NULL -- If @Type doesn't match, set it to NULL diff --git a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3MultiSourceSummary-AA.sql b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3MultiSourceSummary-AA.sql index e20657f..6ca2591 100644 --- a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3MultiSourceSummary-AA.sql +++ b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3MultiSourceSummary-AA.sql @@ -2,7 +2,7 @@ DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES -DECLARE @Month INT = 6; +DECLARE @Month INT = 7; DECLARE @Year INT = 2025; DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]); @@ -63,4 +63,12 @@ VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be INSERT INTO [diunabi-morska].[dbo].[Records] ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) -VALUES ((SELECT NEWID()), 'DynamicCode-0', '[1001]=[9000]+[9005]-[9006]', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); \ No newline at end of file +VALUES ((SELECT NEWID()), 'DynamicCode-0', '[1001]=[9000]+[9005]-[9006]', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T3.MultiSourceSummary', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Priority', '80', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); diff --git a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3SingleSource.sql b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3SingleSource.sql index 9e3ad36..9bc6ab8 100644 --- a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3SingleSource.sql +++ b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T3SingleSource.sql @@ -1,10 +1,10 @@ -- T3-SingleSource -DECLARE @JustForDebug TINYINT = 1; +DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES -DECLARE @Type NVARCHAR(3) = 'FK'; -DECLARE @Month INT = 6; +DECLARE @Type NVARCHAR(3) = 'K5'; +DECLARE @Month INT = 7; DECLARE @Year INT = 2025; IF @Type NOT IN ('K5', 'PU', 'AK', 'FK') @@ -68,3 +68,11 @@ VALUES ((SELECT NEWID()), 'Year', @Year, GETDATE(), GETDATE(), '117be4f0-b5d1-41 INSERT INTO [diunabi-morska].[dbo].[Records] ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T3.SingleSource', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Priority', '100', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); diff --git a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T4SingleSource.sql b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T4SingleSource.sql index dbe2e3c..4a97fa7 100644 --- a/tools/sql-scripts/admin-monthly/CreateProcessWorker-T4SingleSource.sql +++ b/tools/sql-scripts/admin-monthly/CreateProcessWorker-T4SingleSource.sql @@ -4,7 +4,7 @@ DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES DECLARE @Type NVARCHAR(3) = 'FK2'; -DECLARE @Month INT = 6; +DECLARE @Month INT = 7; DECLARE @Year INT = 2025; DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]); @@ -62,3 +62,11 @@ VALUES ((SELECT NEWID()), 'Year', @Year, GETDATE(), GETDATE(), '117be4f0-b5d1-41 INSERT INTO [diunabi-morska].[dbo].[Records] ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) VALUES ((SELECT NEWID()), 'Month', @FormattedMonth, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Plugin', 'Morska.Process.T4.SingleSource', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); + +INSERT INTO [diunabi-morska].[dbo].[Records] +([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) +VALUES ((SELECT NEWID()), 'Priority', '100', GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); diff --git a/tools/sql-scripts/utlis/CreateDictionary.sql b/tools/sql-scripts/utlis/CreateDictionary.sql index 6180497..2aed2f8 100644 --- a/tools/sql-scripts/utlis/CreateDictionary.sql +++ b/tools/sql-scripts/utlis/CreateDictionary.sql @@ -4,7 +4,7 @@ DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]); DECLARE @Name NVARCHAR(50) = CONCAT( - 'L', @Number, '-D-DEPARTMENTS' + 'L', @Number, '-D-D6-SELL-CODES' ); DECLARE @LayerId UNIQUEIDENTIFIER = NEWID(); @@ -27,10 +27,16 @@ DECLARE @Array TABLE ( INSERT INTO @Array (Code, Desc1) VALUES - ('0', 'OTHER'), - ('1','K5'), - ('2','AK'), - ('3','PU') + ('1002', '1102'), + ('1003','1202'), + ('1008','1302'), + ('1009','1302'), + ('9085','1203'), + ('1010','1304'), + ('9086','1005'), + ('1021','1206'), + ('9089','1207'), + ('9091','1208') -- Loop through the array and insert into the target table DECLARE @Code NVARCHAR(50);