fix: update datasourceclasses to expected injected values

data-altinn-no · Sep 16, 2024 · c0e46b4 · c0e46b4
1 parent 18ad3d4
commit c0e46b4
Show file tree

Hide file tree

Showing 24 changed files with 78 additions and 55 deletions.
diff --git a/src/Dan.Plugin.Tilda/Models/TildaDataSource.cs b/src/Dan.Plugin.Tilda/Models/TildaDataSource.cs
@@ -6,6 +6,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Utils;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.Models
 {
@@ -35,11 +36,11 @@ public abstract class TildaDataSource : ITildaDataSource
         protected ILogger _logger;
         protected HttpClient _client;
 
-        public TildaDataSource(Settings settings, HttpClient client, ILogger logger)
+        public TildaDataSource(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory)
         {
-            _settings = settings;
-            _logger = logger;
-            _client = client;
+            _settings = settings.Value;
+            _logger = loggerFactory.CreateLogger<TildaDataSource>();
+            _client = httpClientFactory.CreateClient("SafeHttpClient");
             BaseUri = _settings.GetClassBaseUri(GetType().Name);
         }
 

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Arbeidstilsynet.cs b/src/Dan.Plugin.Tilda/TildaSources/Arbeidstilsynet.cs
@@ -28,8 +28,8 @@ public override string ControlAgency
             get => controlAgency;
         }
 
-        public Arbeidstilsynet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Arbeidstilsynet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
         }
 

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Branntilsyn.cs b/src/Dan.Plugin.Tilda/TildaSources/Branntilsyn.cs
@@ -5,6 +5,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -20,8 +21,8 @@ public class Branntilsyn : TildaDataSource, ITildaAuditReports
         public override string OrganizationNumber => orgNo;
 
 
-        public Branntilsyn(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Branntilsyn(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/DSB.cs b/src/Dan.Plugin.Tilda/TildaSources/DSB.cs
@@ -2,6 +2,7 @@
 using Dan.Plugin.Tilda.Config;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -14,8 +15,8 @@ public class DSB : TildaDataSource
 
         public override string OrganizationNumber => orgNo;
 
-        public DSB(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public DSB(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Digitaliseringsdirektoratet.cs b/src/Dan.Plugin.Tilda/TildaSources/Digitaliseringsdirektoratet.cs
@@ -9,11 +9,12 @@
 using Dan.Plugin.Tilda.Utils;
 using Dan.Plugin.Tilda.Interfaces;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
- 
+
 
     public class Digitaliseringsdirektoratet : TildaDataSource, ITildaPdfReport//, ITildaAuditReports, ITildaNPDIDAuditReports, ITildaAuditCoordination, ITildaTrendReports, ITildaTrendReportsAll, ITildaAuditCoordinationAll, ITildaAuditReportsAll, ITildaAlertMessage
     {
@@ -27,8 +28,8 @@ public class Digitaliseringsdirektoratet : TildaDataSource, ITildaPdfReport//, I
 
         public override bool TestOnly => true;
 
-        public Digitaliseringsdirektoratet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Digitaliseringsdirektoratet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }
@@ -97,7 +98,7 @@ public override async Task<AlertMessageList> GetAlertMessagesAsync(EvidenceHarve
             return list;
         }
 
-        public override async Task<AuditReportList> GetAuditReportsAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate) 
+        public override async Task<AuditReportList> GetAuditReportsAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate)
         {
             var resultList = new AuditReportList(OrganizationNumber);
             try
@@ -187,7 +188,7 @@ public override async Task<NPDIDAuditReportList> GetNPDIDAuditReportsAsync(Evide
                 var mock = new Mock();
 
                 resultList.AuditReports.AddRange(await mock.GetMockNPDIDAuditReports(req.OrganizationNumber, OrganizationNumber, ControlAgency, "342342"));
-              
+
                 if (resultList.AuditReports.Count == 0)
                 {
                     resultList = Helpers.GetEmptyResponseNPDIDAuditReportList(OrganizationNumber);

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Eltilsyn.cs b/src/Dan.Plugin.Tilda/TildaSources/Eltilsyn.cs
@@ -5,6 +5,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -17,8 +18,8 @@ public class Eltilsyn : TildaDataSource, ITildaAuditReports
 
         public override string OrganizationNumber => orgNo;
 
-        public Eltilsyn(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Eltilsyn(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Fiskeridirektoratet.cs b/src/Dan.Plugin.Tilda/TildaSources/Fiskeridirektoratet.cs
@@ -3,6 +3,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -15,8 +16,8 @@ public class Fiskeridirektoratet : TildaDataSource, ITildaAuditReports, ITildaAu
 
         public override string ControlAgency => controlAgency;
 
-        public Fiskeridirektoratet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Fiskeridirektoratet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Havindustritilsynet.cs b/src/Dan.Plugin.Tilda/TildaSources/Havindustritilsynet.cs
@@ -6,6 +6,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -24,8 +25,8 @@ public override string OrganizationNumber
             get => orgNo;
         }
 
-        public Havindustritilsynet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Havindustritilsynet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Helsetilsynet.cs b/src/Dan.Plugin.Tilda/TildaSources/Helsetilsynet.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Config;
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -26,8 +27,8 @@ public override string OrganizationNumber
         }
 
 
-        public Helsetilsynet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Helsetilsynet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Justervesenet.cs b/src/Dan.Plugin.Tilda/TildaSources/Justervesenet.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using Dan.Plugin.Tilda.Config;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -22,8 +23,8 @@ public override string ControlAgency
             get => controlAgency;
         }
 
-        public Justervesenet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Justervesenet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Mattilsynet.cs b/src/Dan.Plugin.Tilda/TildaSources/Mattilsynet.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using Dan.Plugin.Tilda.Config;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -21,8 +22,8 @@ public override string ControlAgency
             get => controlAgency;
         }
 
-        public Mattilsynet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Mattilsynet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/Miljodirektoratet.cs b/src/Dan.Plugin.Tilda/TildaSources/Miljodirektoratet.cs
@@ -8,6 +8,7 @@
 using Dan.Plugin.Tilda.Models;
 using Dan.Plugin.Tilda.Utils;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.TildaSources
@@ -28,8 +29,8 @@ public override string ControlAgency
             get => controlAgency;
         }
 
-        public Miljodirektoratet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public Miljodirektoratet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/NSO.cs b/src/Dan.Plugin.Tilda/TildaSources/NSO.cs
@@ -6,6 +6,7 @@
 using Dan.Plugin.Tilda.Models;
 using Dan.Plugin.Tilda.Interfaces;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -24,8 +25,8 @@ public override string OrganizationNumber
             get => orgNo;
         }
 
-        public NSO(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public NSO(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenAgder.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenAgder.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,12 +17,12 @@ public class StatsforvalterenAgder : TildaDataSource, ITildaAuditReports, ITilda
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenAgder(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenAgder(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }
-        
+
         public StatsforvalterenAgder()
         {
 

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenFellestjenester.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenFellestjenester.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Config;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,8 +17,8 @@ public class StatsforvalterenFellestjenester : TildaDataSource
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenFellestjenester(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenFellestjenester(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenInnlandet.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenInnlandet.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,8 +17,8 @@ public class StatsforvalterenInnlandet : TildaDataSource, ITildaAuditCoordinatio
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenInnlandet(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenInnlandet(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenMoreOgRomsdal.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenMoreOgRomsdal.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,8 +17,8 @@ public class StatsforvalterenMoreOgRomsdal : TildaDataSource, ITildaAuditCoordin
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenMoreOgRomsdal(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenMoreOgRomsdal(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenNordland.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenNordland.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,8 +17,8 @@ public class StatsforvalterenNordland : TildaDataSource, ITildaAuditCoordination
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenNordland(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenNordland(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }

diff --git a/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenOsloViken.cs b/src/Dan.Plugin.Tilda/TildaSources/StatsforvalterenOsloViken.cs
@@ -4,6 +4,7 @@
 using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Models;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Dan.Plugin.Tilda.TildaSources
 {
@@ -16,8 +17,8 @@ public class StatsforvalterenOsloViken : TildaDataSource, ITildaAuditCoordinatio
 
         public override string OrganizationNumber => orgNo;
 
-        public StatsforvalterenOsloViken(Settings settings, HttpClient client, ILogger logger) : base(settings,
-            client, logger)
+        public StatsforvalterenOsloViken(IOptions<Settings> settings, IHttpClientFactory httpClientFactory, ILoggerFactory loggerFactory) :
+            base(settings, httpClientFactory, loggerFactory)
         {
 
         }