From 3c7418974ac46edfa3d81d92e27748375ce494d5 Mon Sep 17 00:00:00 2001
From: masiton <ondrej@masita.net>
Date: Sat, 5 Jul 2025 08:53:27 +0200
Subject: [PATCH] Misc.

---
 assets/example-users.config                     |  2 +-
 code/MessengerApi/Factories/DbContextFactory.cs | 16 ++++++++--------
 code/MessengerApi/Program.cs                    |  3 ++-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/assets/example-users.config b/assets/example-users.config
index 417aaa5..bb83809 100644
--- a/assets/example-users.config
+++ b/assets/example-users.config
@@ -1,2 +1,2 @@
 mobileapp;true;f696442b-e8dc-4074-b34f-94bcece8e74b;aab8f7e9-ad13-4bf8-bb2e-0cd93d81adc0;remote
-remote;true;15d97720-f5b7-47aa-9c1a-71f98b0b9248;8f73f683-7cb3-40df-998e-6e604aef0e53
\ No newline at end of file
+remote;true;15d97720-f5b7-47aa-9c1a-71f98b0b9248;8f73f683-7cb3-40df-998e-6e604aef0e53;mobileapp
\ No newline at end of file
diff --git a/code/MessengerApi/Factories/DbContextFactory.cs b/code/MessengerApi/Factories/DbContextFactory.cs
index 7959e53..362d8d4 100644
--- a/code/MessengerApi/Factories/DbContextFactory.cs
+++ b/code/MessengerApi/Factories/DbContextFactory.cs
@@ -1,5 +1,5 @@
-using MessengerApi.Configuration.Model;
-using MessengerApi.Configuration.Model.Persistence;
+using MessengerApi.Configuration.Model.Persistence;
+using MessengerApi.Configuration.Model.Persistence.Base;
 using MessengerApi.Contracts.Factories;
 using MessengerApi.Db;
 using MessengerApi.Db.Npg;
@@ -10,22 +10,22 @@ namespace MessengerApi.Factories
 {
     public class DbContextFactory : IDbContextFactory, IDbContextFactory<MessengerDbContext>
     {
-        private readonly MessengerConfiguration configuration;
+        private readonly PersistenceConfiguration configuration;
 
-        public DbContextFactory(MessengerConfiguration configuration)
+        public DbContextFactory(PersistenceConfiguration configuration)
         {
             this.configuration = configuration;
         }
 
         public MessengerDbContext CreateDbContext()
         {
-            if (this.configuration.PersistenceConfiguration.PersistenceType == Configuration.Enums.PersistenceTypes.Sql)
+            if (this.configuration.PersistenceType == Configuration.Enums.PersistenceTypes.Sql)
             {
-                return new MessengerSqlDbContext((configuration.PersistenceConfiguration as SqlPersistenceConfiguration).ConnectionString);
+                return new MessengerSqlDbContext((configuration as SqlPersistenceConfiguration).ConnectionString);
             }
-            else if (this.configuration.PersistenceConfiguration.PersistenceType == Configuration.Enums.PersistenceTypes.PostgreSql)
+            else if (this.configuration.PersistenceType == Configuration.Enums.PersistenceTypes.PostgreSql)
             {
-                return new MessengerNpgDbContext((configuration.PersistenceConfiguration as NpgPersistenceConfiguration).ConnectionString);
+                return new MessengerNpgDbContext((configuration as NpgPersistenceConfiguration).ConnectionString);
             }
 
             throw new NotImplementedException();
diff --git a/code/MessengerApi/Program.cs b/code/MessengerApi/Program.cs
index dd0be5d..7cbaf15 100644
--- a/code/MessengerApi/Program.cs
+++ b/code/MessengerApi/Program.cs
@@ -1,5 +1,6 @@
 using MessengerApi.Configuration.Model;
 using MessengerApi.Configuration.Model.Persistence;
+using MessengerApi.Configuration.Model.Persistence.Base;
 using MessengerApi.Configuration.Sources.Environment;
 using MessengerApi.Contracts.Factories;
 using MessengerApi.Contracts.Models.Scoped;
@@ -41,6 +42,7 @@ namespace MessengerApi.Api
             
             builder.Services.AddMemoryCache();
             builder.Services.AddSingleton<MessengerConfiguration>(configuration);
+            builder.Services.AddSingleton<PersistenceConfiguration>(configuration.PersistenceConfiguration);
             builder.Services.AddSingleton<ILogger>(new Factories.LoggerFactory(configuration).CreateLogger());
             builder.Services.AddSingleton<SendEndpointHandler>();
             builder.Services.AddSingleton<HousekeepingHandler>();
@@ -103,7 +105,6 @@ namespace MessengerApi.Api
             });
 
             var app = builder.Build();
-            app.UseDeveloperExceptionPage();
 
             // DB Migrations
             using (var ctx = app.Services.GetRequiredService<IDbContextFactory>().CreateDbContext())