Merge branch 'main' into task/#473_update_shared_nugets

StuartFerguson · web-flow · commit 942352c37977 · 2025-08-01T17:07:42.000+01:00
diff --git a/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs b/FileProcessor.BusinessLogic.Tests/FileProcessingManagerTests.cs
diff --git a/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj b/FileProcessor.BusinessLogic.Tests/FileProcessor.BusinessLogic.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 	  <TargetFramework>net9.0</TargetFramework>
-	  <DebugType>None</DebugType>
+	  <DebugType>Full</DebugType>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/FileProcessor.BusinessLogic/Common/ModelFactory.cs b/FileProcessor.BusinessLogic/Common/ModelFactory.cs
@@ -67,8 +67,7 @@ public List<FileImportLog> ConvertFrom(Guid estateId,
         /// <returns></returns>
         public FileImportLog ConvertFrom(Guid estateId,
                                          TransactionProcessor.Database.Entities.FileImportLog importLog,
-                                         List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList)
-        {
+                                         List<(TransactionProcessor.Database.Entities.FileImportLogFile, TransactionProcessor.Database.Entities.File, Merchant)> importLogFilesList) {
             FileImportLog model = new FileImportLog();
 
             model.FileImportLogId = importLog.FileImportLogId;
diff --git a/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs b/FileProcessor.BusinessLogic/Managers/FileProcessorManager.cs
@@ -6,19 +6,20 @@
 
 namespace FileProcessor.BusinessLogic.Managers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Security.Cryptography.X509Certificates;
-    using System.Threading;
-    using System.Threading.Tasks;
     using Common;
     using FileAggregate;
     using FileProcessor.Models;
     using Microsoft.EntityFrameworkCore;
     using Shared.DomainDrivenDesign.EventSourcing;
+    using Shared.EntityFramework;
     using Shared.EventStore.Aggregate;
     using Shared.Exceptions;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Security.Cryptography.X509Certificates;
+    using System.Threading;
+    using System.Threading.Tasks;
     using FileImportLog = FileProcessor.Models.FileImportLog;
 
     /// <summary>
@@ -28,19 +29,15 @@ namespace FileProcessor.BusinessLogic.Managers
     public class FileProcessorManager : IFileProcessorManager
     {
         #region Fields
-
-        /// <summary>
-        /// The file profiles
-        /// </summary>
         private readonly List<FileProfile> FileProfiles;
 
-        private readonly Shared.EntityFramework.IDbContextFactory<EstateManagementContext> DbContextFactory;
+        private readonly IDbContextResolver<EstateManagementContext> Resolver;
+        private static readonly String EstateManagementDatabaseName = "TransactionProcessorReadModel";
 
         private readonly IModelFactory ModelFactory;
 
         private readonly IAggregateRepository<FileAggregate, DomainEvent> FileAggregateRepository;
 
-        private const String ConnectionStringIdentifier = "EstateReportingReadModel";
 
         #endregion
 
@@ -53,12 +50,12 @@ public class FileProcessorManager : IFileProcessorManager
         /// <param name="dbContextFactory">The database context factory.</param>
         /// <param name="modelFactory">The model factory.</param>
         public FileProcessorManager(List<FileProfile> fileProfiles,
-                                    Shared.EntityFramework.IDbContextFactory<EstateManagementContext> dbContextFactory,
+                                    IDbContextResolver<EstateManagementContext> resolver,
                                     IModelFactory modelFactory,
                                     IAggregateRepository<FileAggregate, DomainEvent> fileAggregateRepository)
         {
             this.FileProfiles = fileProfiles;
-            this.DbContextFactory = dbContextFactory;
+            this.Resolver = resolver;
             this.ModelFactory = modelFactory;
             this.FileAggregateRepository = fileAggregateRepository;
         }
@@ -83,13 +80,20 @@ public async Task<Result<FileProfile>> GetFileProfile(Guid fileProfileId,
 
         }
 
+        private async Task<EstateManagementContext> GetContext(Guid estateId)
+        {
+            ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
+            return resolvedContext.Context;
+        }
+
+
         public async Task<Result<List<FileImportLog>>> GetFileImportLogs(Guid estateId,
                                                                  DateTime startDateTime,
                                                                  DateTime endDateTime,
                                                                  Guid? merchantId,
                                                                  CancellationToken cancellationToken)
         {
-            EstateManagementContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken);
+            EstateManagementContext context = await this.GetContext(estateId);
 
             List<TransactionProcessor.Database.Entities.FileImportLog> importLogQuery =
                 await context.FileImportLogs.Where(f => f.ImportLogDateTime >= startDateTime).ToListAsync(cancellationToken);
@@ -130,8 +134,8 @@ public async Task<Result<FileImportLog>> GetFileImportLog(Guid fileImportLogId,
                                                                      Guid? merchantId,
                                                                      CancellationToken cancellationToken)
         {
-            EstateManagementContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken);
-            
+            EstateManagementContext context = await this.GetContext(estateId);
+
             // Fetch the import log entry
             TransactionProcessor.Database.Entities.FileImportLog importLogQuery = await context.FileImportLogs
                 .SingleOrDefaultAsync(f => f.FileImportLogId == fileImportLogId, cancellationToken);
@@ -158,7 +162,8 @@ join merchant in context.Merchants on file.MerchantId equals merchant.MerchantId
                 entityData.Add((file.fileImportLogFile, file.file, file.merchant));
             }
 
-            return this.ModelFactory.ConvertFrom(estateId, importLogQuery, entityData);
+            var x = this.ModelFactory.ConvertFrom(estateId, importLogQuery, entityData);
+            return Result.Success(x);
         }
 
         public async Task<Result<FileDetails>> GetFile(Guid fileId,
@@ -179,7 +184,7 @@ public async Task<Result<FileDetails>> GetFile(Guid fileId,
 
             FileDetails fileDetails = fileAggregate.GetFile();
 
-            EstateManagementContext context = await this.DbContextFactory.GetContext(estateId, ConnectionStringIdentifier, cancellationToken);
+            EstateManagementContext context = await this.GetContext(estateId);
 
             Merchant merchant = await context.Merchants
                 .SingleOrDefaultAsync(m => m.MerchantId == fileDetails.MerchantId, cancellationToken);
diff --git a/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs b/FileProcessor.BusinessLogic/Services/FileProcessorDomainService.cs
@@ -519,6 +519,7 @@ private async Task<Result> ProcessFile(Guid fileId,
             inProgressFile.MoveTo($"{fileProfile.ProcessedDirectory}/{inProgressFile.Name}", true);
         }
         else {
+            Logger.LogWarning($"About to move file {inProgressFile.Name} to [{fileProfile.FailedDirectory}]. Reason(s) [{String.Join(",", result.Errors)}]");
             inProgressFile.MoveTo($"{fileProfile.FailedDirectory}/{inProgressFile.Name}", true);
         }
 
diff --git a/FileProcessor.IntegrationTests/Common/DockerHelper.cs b/FileProcessor.IntegrationTests/Common/DockerHelper.cs
@@ -63,7 +63,17 @@ public override async Task CreateSubscriptions(){
             }
         }
 
+        protected override EventStoreClientSettings ConfigureEventStoreSettings()
+        {
+            string str = $"esdb://127.0.0.1:{this.EventStoreHttpPort}?tls=false&tlsVerifyCert=false&defaultDeadline=30000";
+            if (this.IsSecureEventStore) {
+                str = $"esdb://admin:changeit@127.0.0.1:{this.EventStoreHttpPort}?tls=true&tlsVerifyCert=false&defaultDeadline=30000";
+            }
+            return EventStoreClientSettings.Create(str);
+        }
+
         public override async Task StartContainersForScenarioRun(String scenarioName, DockerServices dockerServices){
+            
             await base.StartContainersForScenarioRun(scenarioName, dockerServices);
 
             // Setup the base address resolvers
diff --git a/FileProcessor.Testing/TestData.cs b/FileProcessor.Testing/TestData.cs
@@ -147,7 +147,8 @@ public static FileProfile GetFileProfile(String operatorName)
 
         public static List<FileProfile> FileProfiles => new List<FileProfile>
                                                        {
-                                                           FileProfileSafaricom
+                                                           FileProfileSafaricom,
+                                                           TestData.FileProfile
                                                        };
         public static Guid SafaricomFileProfileId = Guid.Parse("079F1FF5-F51E-4BE0-AF4F-2D4862E6D34F");
         public static String SafaricomProfileName = "Safaricom Profile";
@@ -321,7 +322,7 @@ public static FileAggregate GetFileAggregateWithLinesAlreadyProcessed()
                 ["AppSettings:TemporaryFileLocation"] = "C:\\Temp",
                 ["AppSettings:FileProfilePollingWindowInSeconds"] = "30",
                 ["ConnectionStrings:HealthCheck"] = "HeathCheckConnString",
-                ["ConnectionStrings:EstateReportingReadModel"] = "EstateReportingReadModel",
+                ["ConnectionStrings:TransactionProcessorReadModel"] = "EstateReportingReadModel",
                 ["SecurityConfiguration:Authority"] = "https://127.0.0.1",
                 ["EventStoreSettings:ConnectionString"] = "esdb://127.0.0.1:2113",
                 ["EventStoreSettings:ConnectionName"] = "UnitTestConnection",
diff --git a/FileProcessor/Bootstrapper/RepositoryRegistry.cs b/FileProcessor/Bootstrapper/RepositoryRegistry.cs
@@ -2,15 +2,15 @@
 
 namespace FileProcessor.Bootstrapper;
 
-using System;
-using System.Diagnostics.CodeAnalysis;
 using BusinessLogic.Common;
 using BusinessLogic.Managers;
 using FileAggregate;
 using FileImportLogAggregate;
 using Lamar;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Shared.DomainDrivenDesign.EventSourcing;
 using Shared.EntityFramework;
 using Shared.EntityFramework.ConnectionStringConfiguration;
@@ -19,6 +19,8 @@ namespace FileProcessor.Bootstrapper;
 using Shared.EventStore.SubscriptionWorker;
 using Shared.General;
 using Shared.Repositories;
+using System;
+using System.Diagnostics.CodeAnalysis;
 
 [ExcludeFromCodeCoverage]
 public class RepositoryRegistry : ServiceRegistry
@@ -30,38 +32,30 @@ public class RepositoryRegistry : ServiceRegistry
     /// </summary>
     public RepositoryRegistry()
     {
-        Boolean useConnectionStringConfig = bool.Parse(ConfigurationReader.GetValue("AppSettings", "UseConnectionStringConfig"));
-
-        if (useConnectionStringConfig)
+        this.AddSingleton(typeof(IDbContextResolver<>), typeof(DbContextResolver<>));
+        if (Startup.WebHostEnvironment.IsEnvironment("IntegrationTest") || Startup.Configuration.GetValue<Boolean>("ServiceOptions:UseInMemoryDatabase") == true)
         {
-            String connectionStringConfigurationConnString = ConfigurationReader.GetConnectionString("ConnectionStringConfiguration");
-            this.AddSingleton<IConnectionStringConfigurationRepository, ConnectionStringConfigurationRepository>();
-            this.AddTransient(c => { return new ConnectionStringConfigurationContext(connectionStringConfigurationConnString); });
-
-            // TODO: Read this from a the database and set
+            this.AddDbContext<EstateManagementContext>(builder => builder.UseInMemoryDatabase("TransactionProcessorReadModel"));
         }
         else
         {
-            String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
+            this.AddDbContext<EstateManagementContext>(options =>
+                options.UseSqlServer(ConfigurationReader.GetConnectionString("TransactionProcessorReadModel")));
+        }
 
-            this.AddEventStoreProjectionManagementClient(connectionString);
-            this.AddEventStorePersistentSubscriptionsClient(connectionString);
+        String connectionString = Startup.Configuration.GetValue<String>("EventStoreSettings:ConnectionString");
 
-            this.AddEventStoreClient(connectionString);
-            this.AddSingleton<IConnectionStringConfigurationRepository, ConfigurationReaderConnectionStringRepository>();
-        }
+        this.AddEventStoreProjectionManagementClient(connectionString);
+        this.AddEventStorePersistentSubscriptionsClient(connectionString);
+
+        this.AddEventStoreClient(connectionString);
 
         this.AddSingleton<IEventStoreContext, EventStoreContext>();
 
         this.AddSingleton<IAggregateRepository<FileAggregate, DomainEvent>, AggregateRepository<FileAggregate, DomainEvent>>();
         this.AddSingleton<IAggregateRepository<FileImportLogAggregate, DomainEvent>,
             AggregateRepository<FileImportLogAggregate, DomainEvent>>();
 
-        this.AddSingleton<IDbContextFactory<EstateManagementContext>, DbContextFactory<EstateManagementContext>>();
-        this.AddSingleton<Func<String, EstateManagementContext>>(cont => connectionString =>
-                                                                                {
-                                                                                    return new EstateManagementContext(connectionString);
-                                                                                });
         this.AddSingleton<IFileProcessorManager, FileProcessorManager>();
 
         this.AddSingleton<Func<String, Int32, ISubscriptionRepository>>(cont => (esConnString, cacheDuration) => {

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,7 @@ private async Task<Result> ProcessFile(Guid fileId,`
`519`	`519`	`inProgressFile.MoveTo($"{fileProfile.ProcessedDirectory}/{inProgressFile.Name}", true);`
`520`	`520`	`}`
`521`	`521`	`else {`
	`522`	`+ Logger.LogWarning($"About to move file {inProgressFile.Name} to [{fileProfile.FailedDirectory}]. Reason(s) [{String.Join(",", result.Errors)}]");`
`522`	`523`	`inProgressFile.MoveTo($"{fileProfile.FailedDirectory}/{inProgressFile.Name}", true);`
`523`	`524`	`}`
`524`	`525`