diff --git a/DevTools/sql-scripts/utlis/CreateDictionary.sql b/DevTools/sql-scripts/utlis/CreateDictionary.sql index 2aed2f8..4f282d8 100644 --- a/DevTools/sql-scripts/utlis/CreateDictionary.sql +++ b/DevTools/sql-scripts/utlis/CreateDictionary.sql @@ -2,9 +2,9 @@ DECLARE @JustForDebug TINYINT = 0; -- SETUP VARIABLES -DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [diunabi-morska].[dbo].[Layers]); +DECLARE @Number INT = (SELECT COUNT(id) + 1 FROM [DiunaBI-PedrolloPL].[dbo].[Layers]); DECLARE @Name NVARCHAR(50) = CONCAT( - 'L', @Number, '-D-D6-SELL-CODES' + 'L', @Number, 'D-P2-CODES' ); DECLARE @LayerId UNIQUEIDENTIFIER = NEWID(); @@ -16,7 +16,7 @@ BEGIN RETURN; END; -INSERT INTO [diunabi-morska].[dbo].[Layers] +INSERT INTO [DiunaBI-PedrolloPL].[dbo].[Layers] ([Id], [Number], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], [CreatedById], [ModifiedById], [Type]) VALUES (@LayerId, @Number, @Name, GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 3); @@ -27,16 +27,23 @@ DECLARE @Array TABLE ( INSERT INTO @Array (Code, Desc1) VALUES - ('1002', '1102'), - ('1003','1202'), - ('1008','1302'), - ('1009','1302'), - ('9085','1203'), - ('1010','1304'), - ('9086','1005'), - ('1021','1206'), - ('9089','1207'), - ('9091','1208') + ('01',''), + ('02','DOLNOŚLĄSKIE'), + ('03','KUJAWSKO-POMORSKIE'), + ('04','LUBELSKIE'), + ('05','LUBUSKIE'), + ('06','ŁÓDZKIE'), + ('07','MAŁOPOLSKIE'), + ('08','MAZOWIECKIE'), + ('09','OPOLSKIE'), + ('10','PODKARPACKIE'), + ('11','PODLASKIE'), + ('12','POMORSKIE'), + ('13','ŚLĄSKIE'), + ('14','ŚWIĘTOKRZYSKIE'), + ('15','WARMIŃSKO-MAZURSKIE'), + ('16','WIELKOPOLSKIE'), + ('17','ZACHODNIOPOMORSKIE'); -- Loop through the array and insert into the target table DECLARE @Code NVARCHAR(50); @@ -51,7 +58,7 @@ FETCH NEXT FROM CursorArray INTO @Code, @Desc1; WHILE @@FETCH_STATUS = 0 BEGIN - INSERT INTO [diunabi-morska].[dbo].[Records] + INSERT INTO [DiunaBI-PedrolloPL].[dbo].[Records] ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) VALUES (NEWID(), @Code, @Desc1, GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, @LayerId); diff --git a/DiunaBI.Plugins.Morska/Exporters/MorskaBaseExporter.cs b/DiunaBI.Plugins.Morska/Exporters/MorskaBaseExporter.cs deleted file mode 100644 index fb2aac7..0000000 --- a/DiunaBI.Plugins.Morska/Exporters/MorskaBaseExporter.cs +++ /dev/null @@ -1,7 +0,0 @@ -using DiunaBI.Infrastructure.Plugins; - -namespace DiunaBI.Plugins.Morska.Exporters; - -public abstract class MorskaBaseExporter : BaseDataExporter -{ -} diff --git a/DiunaBI.Plugins.Morska/Exporters/googleSheet.export.cs b/DiunaBI.Plugins.Morska/Exporters/googleSheet.export.cs index 61b5a88..0ac1d6c 100644 --- a/DiunaBI.Plugins.Morska/Exporters/googleSheet.export.cs +++ b/DiunaBI.Plugins.Morska/Exporters/googleSheet.export.cs @@ -1,5 +1,6 @@ using System.Globalization; using DiunaBI.Domain.Entities; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4.Data; @@ -7,7 +8,7 @@ using Microsoft.Extensions.Configuration; namespace DiunaBI.Plugins.Morska.Exporters; -public class GoogleSheetExport : MorskaBaseExporter +public class GoogleSheetExport : BaseDataExporter { public override string ExporterType => "GoogleSheet"; private readonly GoogleDriveHelper _googleDriveHelper; diff --git a/DiunaBI.Plugins.Morska/Importers/MorskaBaseImporter.cs b/DiunaBI.Plugins.Morska/Importers/MorskaBaseImporter.cs deleted file mode 100644 index 86bb1b5..0000000 --- a/DiunaBI.Plugins.Morska/Importers/MorskaBaseImporter.cs +++ /dev/null @@ -1,7 +0,0 @@ -using DiunaBI.Infrastructure.Plugins; - -namespace DiunaBI.Plugins.Morska.Importers; - -public abstract class MorskaBaseImporter : BaseDataImporter -{ -} diff --git a/DiunaBI.Plugins.Morska/Importers/MorskaD1Importer.cs b/DiunaBI.Plugins.Morska/Importers/MorskaD1Importer.cs index 36ec0e6..e5fc104 100644 --- a/DiunaBI.Plugins.Morska/Importers/MorskaD1Importer.cs +++ b/DiunaBI.Plugins.Morska/Importers/MorskaD1Importer.cs @@ -1,6 +1,7 @@ using System.Globalization; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using Google.Apis.Sheets.v4; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; @@ -8,7 +9,7 @@ using Microsoft.EntityFrameworkCore; namespace DiunaBI.Plugins.Morska.Importers; -public class MorskaD1Importer : MorskaBaseImporter +public class MorskaD1Importer : BaseDataImporter { public override string ImporterType => "Morska.Import.D1"; diff --git a/DiunaBI.Plugins.Morska/Importers/MorskaD3Importer.cs b/DiunaBI.Plugins.Morska/Importers/MorskaD3Importer.cs index 38a90ea..522812b 100644 --- a/DiunaBI.Plugins.Morska/Importers/MorskaD3Importer.cs +++ b/DiunaBI.Plugins.Morska/Importers/MorskaD3Importer.cs @@ -3,6 +3,7 @@ using System.Text; using System.Text.Json; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; @@ -11,7 +12,7 @@ using Google.Apis.Sheets.v4.Data; namespace DiunaBI.Plugins.Morska.Importers; -public class MorskaD3Importer : MorskaBaseImporter +public class MorskaD3Importer : BaseDataImporter { public override string ImporterType => "Morska.Import.D3"; diff --git a/DiunaBI.Plugins.Morska/Importers/MorskaFK2Importer.cs b/DiunaBI.Plugins.Morska/Importers/MorskaFK2Importer.cs index 0a5c5ab..9fbd35c 100644 --- a/DiunaBI.Plugins.Morska/Importers/MorskaFK2Importer.cs +++ b/DiunaBI.Plugins.Morska/Importers/MorskaFK2Importer.cs @@ -1,13 +1,14 @@ using System.Globalization; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using Google.Apis.Sheets.v4; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; namespace DiunaBI.Plugins.Morska.Importers; -public class MorskaFk2Importer : MorskaBaseImporter +public class MorskaFk2Importer : BaseDataImporter { public override string ImporterType => "Morska.Import.FK2"; diff --git a/DiunaBI.Plugins.Morska/Importers/MorskaStandardImporter.cs b/DiunaBI.Plugins.Morska/Importers/MorskaStandardImporter.cs index 5d3c767..4a401ef 100644 --- a/DiunaBI.Plugins.Morska/Importers/MorskaStandardImporter.cs +++ b/DiunaBI.Plugins.Morska/Importers/MorskaStandardImporter.cs @@ -1,6 +1,7 @@ using System.Globalization; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using Google.Apis.Sheets.v4; using Microsoft.Extensions.Logging; using Microsoft.EntityFrameworkCore; @@ -8,7 +9,7 @@ using Microsoft.EntityFrameworkCore; namespace DiunaBI.Plugins.Morska.Importers; -public class MorskaStandardImporter : MorskaBaseImporter +public class MorskaStandardImporter : BaseDataImporter { public override string ImporterType => "Morska.Import.Standard"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaBaseProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaBaseProcessor.cs deleted file mode 100644 index 08b8e63..0000000 --- a/DiunaBI.Plugins.Morska/Processors/MorskaBaseProcessor.cs +++ /dev/null @@ -1,7 +0,0 @@ -using DiunaBI.Infrastructure.Plugins; - -namespace DiunaBI.Plugins.Morska.Processors; - -public abstract class MorskaBaseProcessor : BaseDataProcessor -{ -} diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaD6Processor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaD6Processor.cs index 02aff0c..4116a73 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaD6Processor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaD6Processor.cs @@ -2,6 +2,7 @@ using System.Text.RegularExpressions; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services.Calculations; using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4.Data; @@ -10,7 +11,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaD6Processor : MorskaBaseProcessor +public class MorskaD6Processor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.D6"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT1R1Processor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT1R1Processor.cs index 4bb625f..fbec2bb 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT1R1Processor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT1R1Processor.cs @@ -1,6 +1,7 @@ using System.Globalization; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using DiunaBI.Infrastructure.Services.Calculations; using Google.Apis.Sheets.v4; @@ -10,7 +11,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT1R1Processor : MorskaBaseProcessor +public class MorskaT1R1Processor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T1.R1"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT1R3Processor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT1R3Processor.cs index de21c61..b1ca793 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT1R3Processor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT1R3Processor.cs @@ -2,6 +2,7 @@ using System.Text.RegularExpressions; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4.Data; @@ -10,7 +11,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT1R3Processor : MorskaBaseProcessor +public class MorskaT1R3Processor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T1.R3"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesProcessor-TO_REMOVE.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesProcessor-TO_REMOVE.cs index 2b65d00..24aaee9 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesProcessor-TO_REMOVE.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesProcessor-TO_REMOVE.cs @@ -1,12 +1,13 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3MultiSourceCopySelectedCodesProcessor : MorskaBaseProcessor +public class MorskaT3MultiSourceCopySelectedCodesProcessor : BaseDataProcessor { public override string ProcessorType => "T3.MultiSourceCopySelectedCodes"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor-TO_REMOVE.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor-TO_REMOVE.cs index 8523f4f..e372cde 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor-TO_REMOVE.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor-TO_REMOVE.cs @@ -1,12 +1,13 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor : MorskaBaseProcessor +public class MorskaT3MultiSourceCopySelectedCodesYearSummaryProcessor : BaseDataProcessor { public override string ProcessorType => "T3.MultiSourceCopySelectedCodesYearSummary"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceSummaryProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceSummaryProcessor.cs index 4988407..dfd309b 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceSummaryProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceSummaryProcessor.cs @@ -1,5 +1,6 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using DiunaBI.Infrastructure.Services.Calculations; using Microsoft.EntityFrameworkCore; @@ -7,7 +8,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3MultiSourceSummaryProcessor : MorskaBaseProcessor +public class MorskaT3MultiSourceSummaryProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T3.MultiSourceSummary"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceYearSummaryProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceYearSummaryProcessor.cs index 42805aa..3370fca 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceYearSummaryProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3MultiSourceYearSummaryProcessor.cs @@ -1,5 +1,6 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using DiunaBI.Infrastructure.Services.Calculations; using Microsoft.EntityFrameworkCore; @@ -7,7 +8,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3MultiSourceYearSummaryProcessor : MorskaBaseProcessor +public class MorskaT3MultiSourceYearSummaryProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T3.MultiSourceYearSummary"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3SingleSourceProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3SingleSourceProcessor.cs index 4ddc5d5..16c8373 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3SingleSourceProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3SingleSourceProcessor.cs @@ -1,13 +1,14 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; -using Google.Apis.Sheets.v4; +using Google.Apis.Sheets.v4; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3SingleSourceProcessor : MorskaBaseProcessor +public class MorskaT3SingleSourceProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T3.SingleSource"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT3SourceYearSummaryProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT3SourceYearSummaryProcessor.cs index df2ee73..9c45c5a 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT3SourceYearSummaryProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT3SourceYearSummaryProcessor.cs @@ -1,5 +1,6 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; @@ -7,7 +8,7 @@ using Google.Apis.Sheets.v4; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT3SourceYearSummaryProcessor : MorskaBaseProcessor +public class MorskaT3SourceYearSummaryProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T3.SourceYearSummary"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT4R2Processor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT4R2Processor.cs index 70c4526..945a288 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT4R2Processor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT4R2Processor.cs @@ -1,6 +1,7 @@ using System.Globalization; using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Google.Apis.Sheets.v4; using Google.Apis.Sheets.v4.Data; @@ -9,7 +10,7 @@ using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT4R2Processor : MorskaBaseProcessor +public class MorskaT4R2Processor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T4.R2"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT4SingleSourceProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT4SingleSourceProcessor.cs index 320eed0..e292032 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT4SingleSourceProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT4SingleSourceProcessor.cs @@ -1,12 +1,13 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Google.Apis.Sheets.v4; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT4SingleSourceProcessor : MorskaBaseProcessor +public class MorskaT4SingleSourceProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T4.SingleSource"; diff --git a/DiunaBI.Plugins.Morska/Processors/MorskaT5LastValuesProcessor.cs b/DiunaBI.Plugins.Morska/Processors/MorskaT5LastValuesProcessor.cs index 2d0d999..86fc8d7 100644 --- a/DiunaBI.Plugins.Morska/Processors/MorskaT5LastValuesProcessor.cs +++ b/DiunaBI.Plugins.Morska/Processors/MorskaT5LastValuesProcessor.cs @@ -1,12 +1,13 @@ using DiunaBI.Domain.Entities; using DiunaBI.Infrastructure.Data; +using DiunaBI.Infrastructure.Plugins; using DiunaBI.Infrastructure.Services; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; namespace DiunaBI.Plugins.Morska.Processors; -public class MorskaT5LastValuesProcessor : MorskaBaseProcessor +public class MorskaT5LastValuesProcessor : BaseDataProcessor { public override string ProcessorType => "Morska.Process.T5.LastValues";