feat: register tilda data sources as collection on startup (#5)

* feat: register tilda data sources as collection on startup * update naming
data-altinn-no · Sep 16, 2024 · 2e038f3 · 2e038f3
1 parent d001fe7
commit 2e038f3
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 163 deletions.
diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaAlertMessage.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaAlertMessage.cs
@@ -1,14 +1,11 @@
-using Nadobe.Common.Models;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    interface ITildaAlertMessage
+    public interface ITildaAlertMessage : ITildaEvidenceType
     {
         public Task<AlertMessageList> GetAlertMessagesAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate, string identifier);
     }

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditCoordination.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditCoordination.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaAuditCoordination
+    public interface ITildaAuditCoordination : ITildaEvidenceType
     {
         public Task<AuditCoordinationList> GetAuditCoordinationAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate);
 

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditCoordinationAll.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditCoordinationAll.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaAuditCoordinationAll
+    public interface ITildaAuditCoordinationAll : ITildaEvidenceType
     {
         public Task<AuditCoordinationList> GetAuditCoordinationAllAsync(EvidenceHarvesterRequest req, string month, string year, string filter);
     }

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditReports.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditReports.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaAuditReports
+    public interface ITildaAuditReports : ITildaEvidenceType
     {
 
         public Task<AuditReportList> GetAuditReportsAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate);

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditReportsAll.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaAuditReportsAll.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaAuditReportsAll
+    public interface ITildaAuditReportsAll : ITildaEvidenceType
     {
 
         public Task<AuditReportList> GetAuditReportsAllAsync(EvidenceHarvesterRequest req, string month, string year, string filter);

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaDataSource.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaDataSource.cs
@@ -0,0 +1,6 @@
+namespace Dan.Plugin.Tilda.Interfaces;
+
+public interface ITildaDataSource
+{
+    bool TestOnly { get; }
+}
diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaEvidenceType.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaEvidenceType.cs
@@ -0,0 +1,5 @@
+namespace Dan.Plugin.Tilda.Interfaces;
+
+public interface ITildaEvidenceType
+{
+}
diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaNPDIDReports.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaNPDIDReports.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaNPDIDAuditReports
+    public interface ITildaNPDIDAuditReports : ITildaEvidenceType
     {
         public Task<NPDIDAuditReportList> GetNPDIDAuditReportsAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate, string npdid);
     }

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaPdfReport.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaPdfReport.cs
@@ -1,14 +1,9 @@
 using Dan.Common.Models;
-using Dan.Plugin.Tilda.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    internal interface ITildaPdfReport
+    internal interface ITildaPdfReport : ITildaEvidenceType
     {
         public Task<byte[]> GetPdfReport(EvidenceHarvesterRequest req, string reportIdentifier);
     }

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaTrendReports.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaTrendReports.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaTrendReports
+    public interface ITildaTrendReports : ITildaEvidenceType
     {
         public Task<TrendReportList> GetDataTrendAsync(EvidenceHarvesterRequest req, DateTime? fromDate, DateTime? toDate);
     }

diff --git a/src/Dan.Plugin.Tilda/Interfaces/ITildaTrendReportsAll.cs b/src/Dan.Plugin.Tilda/Interfaces/ITildaTrendReportsAll.cs
@@ -1,14 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Models;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Interfaces
 {
-    public interface ITildaTrendReportsAll
+    public interface ITildaTrendReportsAll : ITildaEvidenceType
     {
         public Task<TrendReportList> GetDataTrendAllAsync(EvidenceHarvesterRequest req, string month, string year, string filter);
     }

diff --git a/src/Dan.Plugin.Tilda/Models/TildaDataSource.cs b/src/Dan.Plugin.Tilda/Models/TildaDataSource.cs
@@ -3,15 +3,13 @@
 using System.Threading.Tasks;
 using Dan.Common.Models;
 using Dan.Plugin.Tilda.Config;
+using Dan.Plugin.Tilda.Interfaces;
 using Dan.Plugin.Tilda.Utils;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
-using Nadobe.Common.Models;
 
 namespace Dan.Plugin.Tilda.Models
 {
-    public abstract class TildaDataSource
+    public abstract class TildaDataSource : ITildaDataSource
     {
         public abstract string OrganizationNumber { get; }
 

diff --git a/src/Dan.Plugin.Tilda/Program.cs b/src/Dan.Plugin.Tilda/Program.cs
@@ -12,12 +12,16 @@
 using Polly.Extensions.Http;
 using Polly.Registry;
 using System;
+using System.Linq;
 using System.Net.Http;
+using System.Reflection;
+using Dan.Plugin.Tilda.Interfaces;
+using Dan.Plugin.Tilda.Utils;
 using Settings = Dan.Plugin.Tilda.Config.Settings;
 
 var host = new HostBuilder()
     .ConfigureDanPluginDefaults()
-    .ConfigureAppConfiguration((context, configuration) =>
+    .ConfigureAppConfiguration((_, configuration) =>
     {
         configuration
             .AddJsonFile("worker-logging.json", optional:true);
@@ -38,6 +42,18 @@
         services.AddSingleton<IEntityRegistryService, EntityRegistryService>();
         services.AddSingleton<IEvidenceSourceMetadata, Metadata>();
 
+        // Registers all implementations of ITildaDataSources under that interface, making it accessible with
+        // dependency injection by injecting IEnumerable<ITildaDataSource> in constructor
+        Assembly.GetAssembly(typeof(Program))!
+            .ExportedTypes
+            .Where(type =>
+                type is { IsClass: true, Namespace: "Dan.Plugin.Tilda.TildaSources", IsNestedPrivate: false } &&
+                typeof(ITildaDataSource).IsAssignableFrom(type))
+            .ToList()
+            .ForEach(type => services.AddTransient(typeof(ITildaDataSource), type));
+
+        services.AddSingleton<ITildaSourceProvider, TildaSourceProvider>();
+
         var distributedCache = services.BuildServiceProvider().GetRequiredService<IDistributedCache>();
 
         var policyRegistry = services.BuildServiceProvider().GetRequiredService<IPolicyRegistry<string>>();
@@ -59,7 +75,7 @@
             var handler = new HttpClientHandler();
             handler.ClientCertificates.Add(Settings.Certificate);
             return handler;
-        });;
+        });
 
     })
     .Build();

diff --git a/src/Dan.Plugin.Tilda/Tilda.cs b/src/Dan.Plugin.Tilda/Tilda.cs
@@ -37,7 +37,9 @@ public class Tilda
         private List<string> P6Orgs;
         private List<string> P9Orgs;
 
-        public Tilda(IHttpClientFactory httpClientFactory, IOptions<Settings> settings, IPolicyRegistry<string> policyRegistry, IEntityRegistryService entityRegistry, IEvidenceSourceMetadata metadata)
+        private readonly ITildaSourceProvider _tildaSourceProvider;
+
+        public Tilda(IHttpClientFactory httpClientFactory, IOptions<Settings> settings, IPolicyRegistry<string> policyRegistry, IEntityRegistryService entityRegistry, IEvidenceSourceMetadata metadata, ITildaSourceProvider tildaSourceProvider)
         {
             _policyRegistry = policyRegistry;
             _client = httpClientFactory.CreateClient("SafeHttpClient");
@@ -47,6 +49,7 @@ public Tilda(IHttpClientFactory httpClientFactory, IOptions<Settings> settings,
             _entityRegistryService = entityRegistry;
             _entityRegistryService.AllowTestCcrLookup = _settings.IsLocalDevelopment || _settings.IsLocalDevelopment;
             _metadata = metadata;
+            _tildaSourceProvider = tildaSourceProvider;
         }
 
         [Function("TildaMeldingTilAnnenMyndighetv1")]
@@ -200,7 +203,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTildaPdfReportV1(Eviden
             try
             {;
                 //Should always only return ONE source
-                var pdfTarget = SourcesHelper.GetRelevantSources<ITildaPdfReport>(filter, _client, _logger, _settings).FirstOrDefault();
+                var pdfTarget = _tildaSourceProvider.GetRelevantSources<ITildaPdfReport>(filter).FirstOrDefault();
 
                 if (pdfTarget == null)
                 {
@@ -226,7 +229,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesMeldingTilAnnenMyndighe
             var taskList = new List<Task<AlertMessageList>>();
             try
             {
-                foreach (ITildaAlertMessage a in SourcesHelper.GetRelevantSources<ITildaAlertMessage>(param.sourceFilter, _client, _logger, _settings))
+                foreach (ITildaAlertMessage a in _tildaSourceProvider.GetRelevantSources<ITildaAlertMessage>(param.sourceFilter))
                 {
                     taskList.Add(a.GetAlertMessagesAsync(req, param.fromDate, param.toDate, param.identifier));
                 }
@@ -274,20 +277,20 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTildaMetadata(EvidenceH
         {
             var ecb = new EvidenceBuilder(_metadata, "TildaMetadatav1");
 
-            var trend = SourcesHelper.GetAllSources<ITildaTrendReports>(_settings, _client, _logger, false).Select(x=>x.OrganizationNumber + ":" + x.ControlAgency);
-            var trendAll = SourcesHelper.GetAllSources<ITildaTrendReportsAll>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var trend = _tildaSourceProvider.GetAllSources<ITildaTrendReports>().Select(x=>x.OrganizationNumber + ":" + x.ControlAgency);
+            var trendAll = _tildaSourceProvider.GetAllSources<ITildaTrendReportsAll>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
-            var audit = SourcesHelper.GetAllSources<ITildaAuditReports>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
-            var auditAll = SourcesHelper.GetAllSources<ITildaAuditReportsAll>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var audit = _tildaSourceProvider.GetAllSources<ITildaAuditReports>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var auditAll = _tildaSourceProvider.GetAllSources<ITildaAuditReportsAll>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
-            var coordination = SourcesHelper.GetAllSources<ITildaAuditCoordination>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
-            var coordinationAll = SourcesHelper.GetAllSources<ITildaAuditCoordinationAll>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var coordination = _tildaSourceProvider.GetAllSources<ITildaAuditCoordination>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var coordinationAll = _tildaSourceProvider.GetAllSources<ITildaAuditCoordinationAll>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
-            var npdid = SourcesHelper.GetAllSources<ITildaNPDIDAuditReports>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var npdid = _tildaSourceProvider.GetAllSources<ITildaNPDIDAuditReports>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
-            var pdfReport = SourcesHelper.GetAllSources<ITildaPdfReport>(_settings, _client, _logger, false).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var pdfReport = _tildaSourceProvider.GetAllSources<ITildaPdfReport>().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
-            var all = SourcesHelper.GetAllRegisteredSources(_settings).Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
+            var all = _tildaSourceProvider.GetAllRegisteredSources().Select(x => x.OrganizationNumber + ":" + x.ControlAgency);
 
 
 
@@ -316,7 +319,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesNpdid(EvidenceHarvester
             var taskList = new List<Task<NPDIDAuditReportList>>();
             try
             {
-                foreach (ITildaNPDIDAuditReports a in SourcesHelper.GetRelevantSources<ITildaNPDIDAuditReports>(param.sourceFilter, _client, _logger, _settings))
+                foreach (ITildaNPDIDAuditReports a in _tildaSourceProvider.GetRelevantSources<ITildaNPDIDAuditReports>(param.sourceFilter))
                 {
                     taskList.Add(a.GetNPDIDAuditReportsAsync(req, param.fromDate, param.toDate, param.npdid));
                 }
@@ -494,7 +497,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynskoordinering(Evi
             var taskList = new List<Task<AuditCoordinationList>>();
             try
             {
-                foreach (ITildaAuditCoordination a in SourcesHelper.GetRelevantSources<ITildaAuditCoordination>(param.sourceFilter, _client, _logger, _settings))
+                foreach (ITildaAuditCoordination a in _tildaSourceProvider.GetRelevantSources<ITildaAuditCoordination>(param.sourceFilter))
                 {
                     taskList.Add(a.GetAuditCoordinationAsync(req, param.fromDate, param.toDate));
                 }
@@ -619,7 +622,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTrend(EvidenceHarvester
             var taskList = new List<Task<TrendReportList>>();
             try
             {
-                foreach (ITildaTrendReports a in SourcesHelper.GetRelevantSources<ITildaTrendReports>(param.sourceFilter, _client, _logger, _settings))
+                foreach (ITildaTrendReports a in _tildaSourceProvider.GetRelevantSources<ITildaTrendReports>(param.sourceFilter))
                 {
                     taskList.Add( a.GetDataTrendAsync(req, param.fromDate, param.toDate));
                 }
@@ -664,7 +667,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTrend(EvidenceHarvester
 
         private async Task<List<EvidenceValue>> GetEvidenceValuesTrendAll(EvidenceHarvesterRequest req, TildaParameters param)
         {
-            var sourceList = SourcesHelper.GetRelevantSources<ITildaTrendReportsAll>(req.OrganizationNumber, _client, _logger, _settings);
+            var sourceList = _tildaSourceProvider.GetRelevantSources<ITildaTrendReportsAll>(req.OrganizationNumber);
             TrendReportList result = null;
             var brResults = new List<TildaRegistryEntry>();
             var ecb = new EvidenceBuilder(_metadata, "TildaTrendrapportAllev1");
@@ -719,7 +722,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTrendAll(EvidenceHarves
 
         private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynskoordingeringAllASync(EvidenceHarvesterRequest req, TildaParameters param)
         {
-            var sourceList = SourcesHelper.GetRelevantSources<ITildaAuditCoordinationAll>(req.OrganizationNumber, _client, _logger, _settings);
+            var sourceList = _tildaSourceProvider.GetRelevantSources<ITildaAuditCoordinationAll>(req.OrganizationNumber);
             AuditCoordinationList result = null;
             var brResults = new List<TildaRegistryEntry>();
             var ecb = new EvidenceBuilder(_metadata, "TildaTilsynskoordineringAllev1");
@@ -771,7 +774,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynskoordingeringAll
         }
         private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynsRapportAllAsync(EvidenceHarvesterRequest req, TildaParameters param)
         {
-            var sourceList = SourcesHelper.GetRelevantSources<ITildaAuditReportsAll>(req.OrganizationNumber, _client, _logger, _settings);
+            var sourceList = _tildaSourceProvider.GetRelevantSources<ITildaAuditReportsAll>(req.OrganizationNumber);
             AuditReportList result = null;
             var brResults = new List<TildaRegistryEntry>();
             var ecb = new EvidenceBuilder(_metadata, "TildaTilsynsrapportAllev1");
@@ -830,7 +833,7 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynsrapport(Evidence
             var taskList = new List<Task<AuditReportList>>();
             try
             {
-                foreach (ITildaAuditReports a in SourcesHelper.GetRelevantSources<ITildaAuditReports>(param.sourceFilter, _client, _logger, _settings))
+                foreach (ITildaAuditReports a in _tildaSourceProvider.GetRelevantSources<ITildaAuditReports>(param.sourceFilter))
                 {
                     taskList.Add(a.GetAuditReportsAsync(req, param.fromDate, param.toDate));
                 }