Refactoring SetupConsole with DBFactory

Core/Logging/SeqConfiguration.cs

@@ -1,6 +1,3 @@
-using Microsoft.ApplicationInsights.DataContracts;
-using System.Text;
-
 namespace PlanTempus.Core.Logging
 {
     public record SeqConfiguration(string IngestionEndpoint, string ApiKey, string Environment);

Core/ModuleRegistry/SeqLoggingModule.cs

@@ -11,9 +11,9 @@ namespace PlanTempus.Core.ModuleRegistry
 		protected override void Load(ContainerBuilder builder)
 		{
 
-			builder.RegisterType<MessageChannel>()
+			//builder.RegisterType<MessageChannel>()
-		   .As<IMessageChannel<Microsoft.ApplicationInsights.Channel.ITelemetry>>()
+		 //  .As<IMessageChannel<Microsoft.ApplicationInsights.Channel.ITelemetry>>()
-		   .SingleInstance();
+		 //  .SingleInstance();
 
 			builder.RegisterType<SeqBackgroundService>()
 				.As<Microsoft.Extensions.Hosting.IHostedService>()

Core/ModuleRegistry/TelemetryModule.cs

@@ -6,29 +6,30 @@ namespace PlanTempus.Core.ModuleRegistry
 {
     public class TelemetryModule : Module
     {
-        public TelemetryConfig TelemetryConfig { get; set; }
+        public required TelemetryConfig TelemetryConfig { get; set; }
 
         protected override void Load(ContainerBuilder builder)
         {
-            if (TelemetryConfig == null)
-                throw new Exceptions.ConfigurationException("TelemetryConfig is missing");
-
 
             var configuration = TelemetryConfiguration.CreateDefault();
             configuration.ConnectionString = TelemetryConfig.ConnectionString;
             configuration.TelemetryChannel.DeveloperMode = true;
 
             if (TelemetryConfig.UseSeqLoggingTelemetryChannel)
-                configuration.TelemetryChannel = new Telemetry.SeqLoggingTelemetryChannel(); ;
+            {
+                var messageChannel = new Telemetry.MessageChannel();
 
-            var r = new Microsoft.ApplicationInsights.Extensibility.Implementation.TelemetryProcessorChainBuilder(configuration);
+                builder.RegisterInstance(messageChannel)
-            r.Use(next => new Telemetry.Enrichers.EnrichWithMetaTelemetry(next));
+                    .As<Telemetry.IMessageChannel<ITelemetry>>()
-            r.Build();
+                    .SingleInstance();
 
-            //builder.RegisterInstance(configuration);
+                configuration.TelemetryChannel = new Telemetry.SeqLoggingTelemetryChannel(messageChannel);
+            }
+
+            var telemetryProcessorChain = new Microsoft.ApplicationInsights.Extensibility.Implementation.TelemetryProcessorChainBuilder(configuration);
+            telemetryProcessorChain.Use(next => new Telemetry.Enrichers.EnrichWithMetaTelemetry(next));
+            telemetryProcessorChain.Build();
 
-            //builder.RegisterType<Microsoft.ApplicationInsights.TelemetryClient>()
-            //     .InstancePerLifetimeScope();
 
             var client = new Microsoft.ApplicationInsights.TelemetryClient(configuration);
             client.Context.GlobalProperties["Application"] = GetType().Namespace.Split('.')[0];

Core/Telemetry/SeqLoggingTelemetryChannel.cs

@@ -1,50 +1,27 @@
 using Microsoft.ApplicationInsights.Channel;
-using System.Net.Http.Headers;
 
 namespace PlanTempus.Core.Telemetry
 {
     public class SeqLoggingTelemetryChannel : InMemoryChannel, ITelemetryChannel
     {
-        public ITelemetryChannel _defaultChannel;
+        private readonly IMessageChannel<ITelemetry> _messageChannel;
-        static HttpClient _client = new HttpClient();
 
-        static SeqLoggingTelemetryChannel()
+        public SeqLoggingTelemetryChannel(IMessageChannel<ITelemetry> messageChannel)
-        {
-            _client = new HttpClient()
-            {
-                BaseAddress = new Uri("http://localhost:5341"),
-                Timeout = TimeSpan.FromSeconds(30)
-            };
-
-            _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-        }
-
-
-        public SeqLoggingTelemetryChannel()
         {
+            _messageChannel = messageChannel;
         }
         public new void Send(ITelemetry telemetry)
         {
-            //var l = new SeqLogger(_client, "", "");
+            var writeTask = _messageChannel.Writer.WriteAsync(telemetry).AsTask();
-
+            writeTask.ContinueWith(t =>
-            //l.LogToSeq(
+            {
-            //       "Bruger {UserId} loggede ind",
+                if (t.Exception != null)
-            //       "Debug",
+                {
-            //       new Dictionary<string, object> { { "UserId", "12345" }, { "Counter", "i++" } }
+                    throw t.Exception;
-            //   );
+                }
-
+            }, TaskContinuationOptions.OnlyOnFaulted);
-
-            //if (telemetry is Microsoft.ApplicationInsights.DataContracts.TraceTelemetry trace)
-            //{
-            //    var severity = trace.SeverityLevel;
-            //    Console.WriteLine($"Trace severity: {severity}, Message: {trace.Message}");
-            //}
-
 
             base.Send(telemetry);
-            var logEntry = $"{DateTime.UtcNow:u}|{telemetry.Context.Operation.Name}|{telemetry.Context.Operation.Id}";
-            //File.AppendAllText(_filePath, logEntry + Environment.NewLine);
         }
     }
 }

Database/ConfigurationManagementSystem/SetupConfiguration.cs

@@ -15,10 +15,10 @@ public class SetupConfiguration : IDbConfigure<SetupConfiguration.Command>
 	{
 		_connectionFactory = connectionFactory;
 	}
-	public void With(Command notInUse)
+	public void With(Command notInUse, ConnectionStringParameters parameters = null)
 	{
-		using var conn = _connectionFactory.Create();
+        using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
-		using var transaction = conn.OpenWithTransaction();
+        using var transaction = conn.OpenWithTransaction();
 		try
 		{
 			CreateConfigurationTable(conn);

Database/Core/ConnectionFactory/IDbConnectionFactory.cs

@@ -1,8 +1,10 @@
 namespace PlanTempus.Database.Core.ConnectionFactory
 {
-	public interface IDbConnectionFactory
+    public record ConnectionStringParameters(string user, string pwd);
-	{
+
-		System.Data.IDbConnection Create();
+    public interface IDbConnectionFactory
-		System.Data.IDbConnection Create(string username, string password);
+    {
-	}
+        System.Data.IDbConnection Create();
+        System.Data.IDbConnection Create(ConnectionStringParameters connectionStringTemplateParameters);
+    }
 }

Database/Core/ConnectionFactory/PostgresConnectionFactory.cs

@@ -2,9 +2,9 @@
 using System.Data;
 namespace PlanTempus.Database.Core.ConnectionFactory
 {
-	
 
-	public class PostgresConnectionFactory : IDbConnectionFactory, IAsyncDisposable
+
+    public class PostgresConnectionFactory : IDbConnectionFactory, IAsyncDisposable
     {
         private readonly NpgsqlDataSource _baseDataSource;
         private readonly Action<NpgsqlDataSourceBuilder> _configureDataSource;
@@ -29,13 +29,13 @@ namespace PlanTempus.Database.Core.ConnectionFactory
             return _baseDataSource.CreateConnection();
         }
 
-        public IDbConnection Create(string username, string password)
+        public IDbConnection Create(ConnectionStringParameters param)
         {
             var connectionStringBuilder = new NpgsqlConnectionStringBuilder(
                 _baseDataSource.ConnectionString)
             {
-                Username = username,
+                Username = param.user,
-                Password = password
+                Password = param.pwd
             };
 
             var tempDataSourceBuilder = new NpgsqlDataSourceBuilder(

Database/Core/DCL/SetupApplicationUser.cs

@@ -5,105 +5,102 @@ using PlanTempus.Database.Core.ConnectionFactory;
 
 namespace PlanTempus.Database.Core.DCL
 {
+    /// <summary>
+    /// Only a superadmin or similar can create Application Users
+    /// </summary>
+    public class SetupApplicationUser : IDbConfigure<SetupApplicationUser.Command>
+    {
+        public class Command
+        {
+            public required string Schema { get; init; }
+            public required string User { get; init; }
+            public required string Password { get; init; }
+        }
 
-	/// <summary>
+        Command _command;
-	/// Only a superadmin or similar can create Application Users
+        private readonly IDbConnectionFactory _connectionFactory;
-	/// </summary>
-	public class SetupApplicationUser : IDbConfigure<SetupApplicationUser.Command>
-	{
-		public class Command
-		{
-			public required string Schema { get; init; }
-			public required string User { get; init; }
-			public required string Password { get; init; }
-		}
 
+        public SetupApplicationUser(IDbConnectionFactory connectionFactory)
+        {
+            _connectionFactory = connectionFactory;
+        }
 
-		Command _command;
+        public void With(Command command, ConnectionStringParameters parameters = null)
-		private readonly IDbConnectionFactory _connectionFactory;
+        {
+            _command = command;
 
-		public SetupApplicationUser(IDbConnectionFactory connectionFactory)
+            if (!Validations.IsValidSchemaName(_command.Schema))
-		{
+                throw new ArgumentException("Invalid schema name", _command.Schema);
-			_connectionFactory = connectionFactory;
-		}
 
-		public void With(Command command)
+            using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
-		{
+            using var transaction = conn.OpenWithTransaction();
-			_command = command;
+            try
+            {
+                CreateSchema(conn);
+                CreateRole(conn);
+                GrantSchemaRights(conn);
 
-			if (!Validations.IsValidSchemaName(_command.Schema))
+                transaction.Commit();
-				throw new ArgumentException("Invalid schema name", _command.Schema);
+            }
+            catch (Exception ex)
+            {
+                transaction.Rollback();
+                throw new InvalidOperationException("Failed to SetupApplicationUser in Database", ex);
+            }
+        }
 
-			using var conn = _connectionFactory.Create();
+        private void CreateSchema(IDbConnection db)
-			using var transaction = conn.OpenWithTransaction();
+        {
-			try
+            var sql = $"CREATE SCHEMA IF NOT EXISTS {_command.Schema}";
-			{
+            db.ExecuteSql(sql);
-				CreateSchema(conn);
+        }
-				CreateRole(conn);
-				GrantSchemaRights(conn);
 
-				transaction.Commit();
+        private void CreateRole(IDbConnection db)
-			}
+        {
-			catch (Exception ex)
+            var sql = $@"
-			{
-				transaction.Rollback();
-				throw new InvalidOperationException("Failed to SetupApplicationUser in Database", ex);
-			}
-
-		}
-
-		private void CreateSchema(IDbConnection db)
-		{
-			var sql = $"CREATE SCHEMA IF NOT EXISTS {_command.Schema}";
-			db.ExecuteSql(sql);
-		}
-
-		private void CreateRole(IDbConnection db)
-		{
-			var sql = $@"
 							DO $$ 
 							BEGIN
 							   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '{_command.User}') THEN
 								   CREATE ROLE {_command.User} WITH CREATEDB CREATEROLE LOGIN PASSWORD '{_command.Password}';
 							   END IF;
 							END $$;";
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
-			var sql1 = $"ALTER ROLE {_command.User} SET search_path='{_command.Schema}';";
+            var sql1 = $"ALTER ROLE {_command.User} SET search_path='{_command.Schema}';";
-			db.ExecuteSql(sql1);
+            db.ExecuteSql(sql1);
-		}
+        }
 
-		private void GrantSchemaRights(IDbConnection db)
+        private void GrantSchemaRights(IDbConnection db)
-		{
+        {
-			// Grant USAGE og alle CREATE rettigheder på schema niveau
+            // Grant USAGE og alle CREATE rettigheder på schema niveau
-			var sql = $@"
+            var sql = $@"
 						GRANT USAGE ON SCHEMA {_command.Schema} TO {_command.User};
 						GRANT ALL ON SCHEMA {_command.Schema} TO {_command.User};";
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
-			// Grant rettigheder på eksisterende og fremtidige tabeller
+            // Grant rettigheder på eksisterende og fremtidige tabeller
-			var sql1 = $"GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA {_command.Schema} TO {_command.User};";
+            var sql1 = $"GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA {_command.Schema} TO {_command.User};";
-			db.ExecuteSql(sql1);
+            db.ExecuteSql(sql1);
 
-			var sql2 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT ALL PRIVILEGES ON TABLES TO {_command.User};";
+            var sql2 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT ALL PRIVILEGES ON TABLES TO {_command.User};";
-			db.ExecuteSql(sql2);
+            db.ExecuteSql(sql2);
 
-			// Grant sequence rettigheder
+            // Grant sequence rettigheder
-			var sql3 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_command.Schema} TO {_command.User};";
+            var sql3 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_command.Schema} TO {_command.User};";
-			db.ExecuteSql(sql3);
+            db.ExecuteSql(sql3);
 
-			// Grant execute på functions
+            // Grant execute på functions
-			var sql4 = $"GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA {_command.Schema} TO {_command.User};";
+            var sql4 = $"GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA {_command.Schema} TO {_command.User};";
-			db.ExecuteSql(sql4);
+            db.ExecuteSql(sql4);
 
-			// Grant for fremtidige functions
+            // Grant for fremtidige functions
-			var sql5 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT EXECUTE ON FUNCTIONS TO {_command.User};";
+            var sql5 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT EXECUTE ON FUNCTIONS TO {_command.User};";
-			db.ExecuteSql(sql5);
+            db.ExecuteSql(sql5);
 
-			// Grant for fremtidige sequences
+            // Grant for fremtidige sequences
-			var sql6 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT USAGE ON SEQUENCES TO {_command.User};";
+            var sql6 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} GRANT USAGE ON SEQUENCES TO {_command.User};";
-			db.ExecuteSql(sql6);
+            db.ExecuteSql(sql6);
-		}
+        }
 
-	}
+    }
 }

Database/Core/DCL/SetupDbAdmin.cs

@@ -21,39 +21,39 @@ namespace PlanTempus.Database.Core.DCL
 
 
         Command _command;
-		private readonly IDbConnectionFactory _connectionFactory;
+        private readonly IDbConnectionFactory _connectionFactory;
 
-		public SetupDbAdmin(IDbConnectionFactory connectionFactory)
+        public SetupDbAdmin(IDbConnectionFactory connectionFactory)
         {
-			_connectionFactory = connectionFactory;
+            _connectionFactory = connectionFactory;
-		}
+        }
 
 
-        public void With(Command command)
+        public void With(Command command, ConnectionStringParameters parameters = null)
         {
             _command = command;
 
             if (!Validations.IsValidSchemaName(_command.Schema))
                 throw new ArgumentException("Invalid schema name", _command.Schema);
 
-			using var conn = _connectionFactory.Create();
+            using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
-			using var transaction = conn.OpenWithTransaction();
+            using var transaction = conn.OpenWithTransaction();
-			try
+            try
-			{
+            {
-				CreateSchema(conn);
+                CreateSchema(conn);
-				CreateRole(conn);
+                CreateRole(conn);
-				GrantSchemaRights(conn);
+                GrantSchemaRights(conn);
 
-				transaction.Commit();
+                transaction.Commit();
-			}
+            }
-			catch (Exception ex)
+            catch (Exception ex)
-			{
+            {
-				transaction.Rollback();
+                transaction.Rollback();
-				throw new InvalidOperationException("Failed to SetupApplicationUser in Database", ex);
+                throw new InvalidOperationException("Failed to SetupApplicationUser in Database", ex);
-			}
+            }
+
+        }
 
-		}
-     
         private void CreateSchema(IDbConnection db)
         {
             var sql = $"CREATE SCHEMA IF NOT EXISTS {_command.Schema}";
@@ -69,13 +69,13 @@ namespace PlanTempus.Database.Core.DCL
 								   CREATE ROLE {_command.User} WITH CREATEDB CREATEROLE LOGIN PASSWORD '{_command.Password}';
 							   END IF;
 							END $$;";
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
             var sql1 = $"ALTER ROLE {_command.User} SET search_path='{_command.Schema}';";
-			db.ExecuteSql(sql1);
+            db.ExecuteSql(sql1);
 
             var sql2 = $"ALTER SCHEMA {_command.Schema} OWNER TO {_command.User};";
-			db.ExecuteSql(sql2);
+            db.ExecuteSql(sql2);
 
         }
 
@@ -83,10 +83,9 @@ namespace PlanTempus.Database.Core.DCL
         {
             // Grant USAGE og alle CREATE rettigheder på schema niveau
             //GRANT USAGE ON SCHEMA {_command.Schema} TO {_command.User};
-            var sql = $@"						
+            var sql = $@"GRANT CREATE ON SCHEMA {_command.Schema} TO {_command.User};";
-						GRANT CREATE ON SCHEMA {_command.Schema} TO {_command.User};";
 
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
             // Grant rettigheder på eksisterende og fremtidige tabeller
             //var sql1 = $"GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA {_command.Schema} TO {_command.User};";

Database/Core/DCL/SetupOrganizationUser.cs

@@ -2,6 +2,7 @@
 using Insight.Database;
 using PlanTempus.Database.Common;
 using PlanTempus.Database.Core;
+using PlanTempus.Database.Core.ConnectionFactory;
 
 namespace PlanTempus.Database.Core.DCL
 {
@@ -14,81 +15,75 @@ namespace PlanTempus.Database.Core.DCL
             public required string Password { get; init; }
         }
 
-        IDbConnection _db;
         Command _command;
+        private readonly IDbConnectionFactory _connectionFactory;
 
-        public SetupOrganization(IDbConnection db)
+
+        public SetupOrganization(IDbConnectionFactory connectionFactory)
         {
-            _db = db;
+            _connectionFactory = connectionFactory;
         }
 
-        public void With(Command command)
+        public void With(Command command, ConnectionStringParameters parameters = null)
         {
-
             _command = command;
 
-
             if (!Validations.IsValidSchemaName(_command.Schema))
                 throw new ArgumentException("Invalid schema name", _command.Schema);
 
-            using (var transaction = _db.BeginTransaction())
+            using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
+            using var transaction = conn.OpenWithTransaction();
+            try
             {
-                try
+                CreateSchema(conn);
-                {
+                CreateRole(conn);
-                    CreateSchema();
+                GrantSchemaRights(conn);
-                    CreateRole();
-                    GrantSchemaRights();
 
-                    transaction.Commit();
+                transaction.Commit();
-                }
+            }
-                catch (Exception ex)
+            catch (Exception ex)
-                {
+            {
-                    transaction.Rollback();
+                transaction.Rollback();
-                    throw new InvalidOperationException("Failed to SetupOrganization in Database", ex);
+                throw new InvalidOperationException("Failed to SetupOrganization in Database", ex);
-                }
             }
 
         }
-        private void ExecuteSql(string sql)
+       
-        {
+        private void CreateSchema(IDbConnection db)
-            _db.ExecuteSql(sql);
-        }
-
-        private void CreateSchema()
         {
             var sql = $"CREATE SCHEMA IF NOT EXISTS {_command.Schema}";
-            ExecuteSql(sql);
+            db.ExecuteSql(sql);
         }
 
-        private void CreateRole()
+        private void CreateRole(IDbConnection db)
         {
             var sql = $"CREATE ROLE {_command.User} LOGIN PASSWORD '{_command.Password}';";
-            ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
             var sql1 = $"ALTER ROLE {_command.User} SET search_path='{_command.Schema}';";
-            ExecuteSql(sql1);
+            db.ExecuteSql(sql1);
 
         }
 
-        private void GrantSchemaRights()
+        private void GrantSchemaRights(IDbConnection db)
         {
             var sql = $"GRANT USAGE ON SCHEMA {_command.Schema} TO {_command.User};";
-            ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
             var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_command.Schema} " +
                         $"GRANT INSERT, SELECT, UPDATE PRIVILEGES ON TABLES TO {_command.User};";
-            ExecuteSql(sql1);
+            db.ExecuteSql(sql1);
 
             var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_command.Schema} TO {_command.User};";
-            ExecuteSql(sql2);
+            db.ExecuteSql(sql2);
 
             var sql3 = $"GRANT CREATE TABLE ON SCHEMA {_command.Schema} TO {_command.User};";
-            ExecuteSql(sql3);
+            db.ExecuteSql(sql3);
         }
-        public void RevokeCreateTable()
+        public void RevokeCreateTable(IDbConnection db)
         {
             var sql = $"REVOKE CREATE TABLE ON SCHEMA {_command.Schema} FROM {_command.User};";
-            ExecuteSql(sql);
+            db.ExecuteSql(sql);
         }
     }
 }

Database/Core/DDL/SetupIdentitySystem.cs

@@ -4,58 +4,58 @@ using System.Data;
 
 namespace PlanTempus.Database.Core.DDL
 {
-	/// <summary>
+    /// <summary>
-	/// This is by purpose not async await
+    /// This is by purpose not async await
-	/// It is intended that this is created with the correct Application User, which is why the schema name is omitted.
+    /// It is intended that this is created with the correct Application User, which is why the schema name is omitted.
-	/// </summary>
+    /// </summary>
-	public class SetupIdentitySystem : IDbConfigure<SetupIdentitySystem.Command>
+    public class SetupIdentitySystem : IDbConfigure<SetupIdentitySystem.Command>
-	{
+    {
-		public class Command
+        public class Command
-		{
+        {
-			public required string Schema { get; init; }
+            public required string Schema { get; init; }
-		}
+        }
 
-		Command _command;
+        Command _command;
-		private readonly IDbConnectionFactory _connectionFactory;
+        private readonly IDbConnectionFactory _connectionFactory;
 
-		public SetupIdentitySystem(IDbConnectionFactory connectionFactory)
+        public SetupIdentitySystem(IDbConnectionFactory connectionFactory)
-		{
+        {
-			_connectionFactory = connectionFactory;
+            _connectionFactory = connectionFactory;
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Creates the system tables in the specified schema within a transaction.
+        /// Creates the system tables in the specified schema within a transaction.
-		/// </summary>
+        /// </summary>
-		/// <param name="schema">The schema name where the tables will be created.</param>
+        /// <param name="schema">The schema name where the tables will be created.</param>
-		public void With(Command command)
+        public void With(Command command, ConnectionStringParameters parameters = null)
-		{
+        {
-			_command = command;
+            _command = command;
 
-			using var conn = _connectionFactory.Create();
+            using var conn = parameters is null ? _connectionFactory.Create() : _connectionFactory.Create(parameters);
-			using var transaction = conn.OpenWithTransaction();
+            using var transaction = conn.OpenWithTransaction();
-			try
+            try
-			{
+            {
-				CreateUsersTable(conn);
+                CreateUsersTable(conn);
-				CreateOrganizationsTable(conn);
+                CreateOrganizationsTable(conn);
-				CreateUserOrganizationsTable(conn);
+                CreateUserOrganizationsTable(conn);
-				SetupRLS(conn);
+                SetupRLS(conn);
 
-				transaction.Commit();
+                transaction.Commit();
-			}
+            }
-			catch (Exception ex)
+            catch (Exception ex)
-			{
+            {
-				transaction.Rollback();
+                transaction.Rollback();
-				throw new InvalidOperationException("Failed to SetupIdentitySystem. Transaction is rolled back", ex);
+                throw new InvalidOperationException("Failed to SetupIdentitySystem. Transaction is rolled back", ex);
-			}
+            }
-		}
+        }
-	 
 
-		/// <summary>
+
-		/// Creates the users table
+        /// <summary>
-		/// </summary>
+        /// Creates the users table
-		void CreateUsersTable(IDbConnection db)
+        /// </summary>
-		{
+        void CreateUsersTable(IDbConnection db)
-			var sql = @$"
+        {
+            var sql = @$"
                 CREATE TABLE IF NOT EXISTS {_command.Schema}.users (
                     id SERIAL PRIMARY KEY,
                     email VARCHAR(256) NOT NULL UNIQUE,
@@ -70,16 +70,16 @@ namespace PlanTempus.Database.Core.DDL
                     last_login_at TIMESTAMPTZ NULL
                 );";
 
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Creates the organizations table
+        /// Creates the organizations table
-		/// </summary>
+        /// </summary>
-		void CreateOrganizationsTable(IDbConnection db)
+        void CreateOrganizationsTable(IDbConnection db)
-		{
+        {
-			var sql = @$"
+            var sql = @$"
                 CREATE TABLE IF NOT EXISTS {_command.Schema}.organizations (
                     id SERIAL PRIMARY KEY,
                     connection_string VARCHAR(500) NOT NULL,
@@ -88,16 +88,16 @@ namespace PlanTempus.Database.Core.DDL
                     created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
                 );";
 
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Creates the user_organizations table
+        /// Creates the user_organizations table
-		/// </summary>
+        /// </summary>
-		void CreateUserOrganizationsTable(IDbConnection db)
+        void CreateUserOrganizationsTable(IDbConnection db)
-		{
+        {
-			var sql = @$"
+            var sql = @$"
                 CREATE TABLE IF NOT EXISTS {_command.Schema}.user_organizations (
                     user_id INTEGER NOT NULL REFERENCES {_command.Schema}.users(id),
                     organization_id INTEGER NOT NULL REFERENCES {_command.Schema}.organizations(id),
@@ -106,37 +106,37 @@ namespace PlanTempus.Database.Core.DDL
                     PRIMARY KEY (user_id, organization_id)
                 );";
 
-			db.ExecuteSql(sql);
+            db.ExecuteSql(sql);
 
-		}
+        }
 
-		/// <summary>
+        /// <summary>
-		/// Sets up Row Level Security (RLS) for the organizations and user_organizations tables.
+        /// Sets up Row Level Security (RLS) for the organizations and user_organizations tables.
-		/// </summary>
+        /// </summary>
-		void SetupRLS(IDbConnection db)
+        void SetupRLS(IDbConnection db)
-		{
+        {
-			var sql = new[]
+            var sql = new[]
-				{
+                {
-					$"ALTER TABLE {_command.Schema}.organizations ENABLE ROW LEVEL SECURITY;",
+                    $"ALTER TABLE {_command.Schema}.organizations ENABLE ROW LEVEL SECURITY;",
-					$"ALTER TABLE {_command.Schema}.user_organizations ENABLE ROW LEVEL SECURITY;",
+                    $"ALTER TABLE {_command.Schema}.user_organizations ENABLE ROW LEVEL SECURITY;",
-					$"DROP POLICY IF EXISTS organization_access ON {_command.Schema}.organizations;",
+                    $"DROP POLICY IF EXISTS organization_access ON {_command.Schema}.organizations;",
-					@$"CREATE POLICY organization_access ON {_command.Schema}.organizations
+                    @$"CREATE POLICY organization_access ON {_command.Schema}.organizations
                         USING (id IN (
                             SELECT organization_id 
                             FROM {_command.Schema}.user_organizations 
                             WHERE user_id = current_setting('app.user_id', TRUE)::INTEGER
                         )) WITH CHECK (true);",
-					$"DROP POLICY IF EXISTS user_organization_access ON {_command.Schema}.user_organizations;",
+                    $"DROP POLICY IF EXISTS user_organization_access ON {_command.Schema}.user_organizations;",
-					@$"CREATE POLICY user_organization_access ON {_command.Schema}.user_organizations
+                    @$"CREATE POLICY user_organization_access ON {_command.Schema}.user_organizations
                         USING (user_id = current_setting('app.user_id', TRUE)::INTEGER) WITH CHECK (true);"
-				};
+                };
 
-			foreach (var statement in sql)
+            foreach (var statement in sql)
-			{
+            {
-				db.ExecuteSql(statement);
+                db.ExecuteSql(statement);
-			}
+            }
-		}
+        }
 
 
-	}
+    }
 }

Database/Core/IDbConfigure.cs

@@ -2,6 +2,6 @@
 {
     public interface IDbConfigure<T>
     {
-        void With(T command);
+        void With(T command, ConnectionFactory.ConnectionStringParameters parameters = null);
     }
 }

Database/Core/Sql/SqlOperations.cs

@@ -6,8 +6,6 @@ using System.Data;
 
 namespace PlanTempus.Database.Core.Sql
 {
-	
-
 	public class DatabaseScope : IDisposable
     {
         private readonly IDbConnection _connection;
@@ -99,6 +97,4 @@ namespace PlanTempus.Database.Core.Sql
         }
 
     }
-
-
 }

Database/ModuleRegistry/DbPostgreSqlModule.cs

@@ -3,7 +3,7 @@ using Npgsql;
 using System.Data;
 namespace PlanTempus.Database.ModuleRegistry
 {
-    
+
     public class DbPostgreSqlModule : Module
     {
         public required string ConnectionString { get; set; }
@@ -12,42 +12,14 @@ namespace PlanTempus.Database.ModuleRegistry
         {
             Insight.Database.Providers.PostgreSQL.PostgreSQLInsightDbProvider.RegisterProvider();
 
-            builder.Register<Core.ConnectionFactory.IDbConnectionFactory>(c =>
+            builder.RegisterType<Core.ConnectionFactory.PostgresConnectionFactory>()
-                new Core.ConnectionFactory.PostgresConnectionFactory(ConnectionString))
+             .As<Core.ConnectionFactory.IDbConnectionFactory>()
-                .SingleInstance();
+             .WithParameter(new TypedParameter(typeof(string), ConnectionString))
+             .SingleInstance();
 
             builder.RegisterType<Core.Sql.SqlOperations>()
                 .As<Core.Sql.IDatabaseOperations>();
         }
     }
-    public class PostgresConnectionFactory1 //: IDbConnectionFactory
-    {
-        private readonly string _baseConnectionString;
-
-        public PostgresConnectionFactory1(string connectionString)
-        {
-            _baseConnectionString = connectionString;
-        }
-
-        public IDbConnection Create()
-        {
-            return new NpgsqlConnection(_baseConnectionString);
-        }
-
-        public IDbConnection Create(string username, string password)
-        {
-            var builder = new NpgsqlConnectionStringBuilder(_baseConnectionString)
-            {
-                Username = username,
-                Password = password
-            };
-
-            return new NpgsqlConnection(builder.ToString());
-        }
-    }
-
-
-  
-
 
 }

SetupInfrastructure/Program.cs

@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Npgsql;
 using PlanTempus.Database.ConfigurationManagementSystem;
+using PlanTempus.Database.Core.ConnectionFactory;
 using PlanTempus.Database.Core.DCL;
 using PlanTempus.Database.Core.DDL;
 using System.Data;
@@ -25,7 +26,7 @@ namespace PlanTempus.SetupInfrastructure
     /// </summary>
     internal class Program
     {
-        
+
         static async Task Main(string[] args)
         {
             try
@@ -44,9 +45,9 @@ namespace PlanTempus.SetupInfrastructure
                 await host.StartAsync();
                 Console.WriteLine("Host has started.");
 
-				
+
-				var console = host.Services.GetRequiredService<ConsoleService>();
+                var console = host.Services.GetRequiredService<ConsoleService>();
-				console.Run();
+                console.Run();
 
                 await host.WaitForShutdownAsync();
             }
@@ -59,31 +60,30 @@ namespace PlanTempus.SetupInfrastructure
     public class ConsoleService
     {
 
-		static ConsoleColor _backgroundColor = Console.BackgroundColor;
+        static ConsoleColor _backgroundColor = Console.BackgroundColor;
-		static ConsoleColor _foregroundColor = Console.ForegroundColor;
+        static ConsoleColor _foregroundColor = Console.ForegroundColor;
+        private readonly IDbConnectionFactory _connectionFactory;
+        private readonly SetupDbAdmin _setupDbAdmin;
+        private readonly SetupIdentitySystem _setupIdentitySystem;
+        private readonly SetupConfiguration _setupConfiguration;
+        private readonly SetupApplicationUser _setupApplicationUser;
 
-		private readonly SetupDbAdmin _setupDbAdmin;
+        public ConsoleService(IDbConnectionFactory connectionFactory, SetupDbAdmin setupDbAdmin, SetupIdentitySystem setupIdentitySystem, SetupConfiguration setupConfiguration, SetupApplicationUser setupApplicationUser)
-		private readonly SetupIdentitySystem _setupIdentitySystem;
-		private readonly SetupConfiguration _setupConfiguration;
-		private readonly SetupApplicationUser _setupApplicationUser;
-
-		public ConsoleService(SetupDbAdmin setupDbAdmin, SetupIdentitySystem setupIdentitySystem, SetupConfiguration setupConfiguration, SetupApplicationUser setupApplicationUser)
         {
-			_setupDbAdmin = setupDbAdmin;
+            _connectionFactory = connectionFactory;
-			_setupIdentitySystem = setupIdentitySystem;
+            _setupDbAdmin = setupDbAdmin;
-			_setupConfiguration = setupConfiguration;
+            _setupIdentitySystem = setupIdentitySystem;
-			_setupApplicationUser = setupApplicationUser;
+            _setupConfiguration = setupConfiguration;
-		}
+            _setupApplicationUser = setupApplicationUser;
-        static bool IsSuperAdmin()
+        }
+        bool IsSuperAdmin(ConnectionStringParameters parameters)
         {
-            //test db access
             Console.WriteLine("Testing db access...");
 
             string query = @"SELECT usename, usesuper FROM pg_user WHERE usename = CURRENT_USER;";
 
-            var conn = new NpgsqlConnection();
+            using var conn = _connectionFactory.Create(parameters);
-
+            var result = (dynamic)conn.QuerySql(query).Single();
-			var result = (dynamic)conn.QuerySql(query).Single();
 
             string username = result.usename;
             bool isSuperuser = (bool)result.usesuper;
@@ -91,12 +91,12 @@ namespace PlanTempus.SetupInfrastructure
             if ((bool)result.usesuper)
             {
                 Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine();
                 Console.BackgroundColor = ConsoleColor.Yellow;
-                Console.WriteLine();
                 Console.WriteLine("TEST SUCCESSFULLY");
-                Console.WriteLine();
                 Console.ForegroundColor = ConsoleColor.White;
-                Console.BackgroundColor = _backgroundColor;
+                Console.BackgroundColor = ConsoleColor.Black;
+                Console.WriteLine();
                 Console.WriteLine("-------------------------------");
                 Console.WriteLine();
                 Console.WriteLine($"Username: {username}");
@@ -118,7 +118,7 @@ namespace PlanTempus.SetupInfrastructure
             Console.WriteLine("TEST WAS NOT SUCCESSFULLY");
             Console.WriteLine();
             Console.ForegroundColor = ConsoleColor.White;
-            Console.BackgroundColor = _backgroundColor;
+            Console.BackgroundColor = ConsoleColor.Black;
             Console.WriteLine("-------------------------------");
             Console.WriteLine();
             Console.WriteLine($"Username: {username}");
@@ -169,40 +169,38 @@ namespace PlanTempus.SetupInfrastructure
                             string.IsNullOrEmpty(userPass.Split(":")[0]) ||
                             string.IsNullOrEmpty(userPass.Split(":")[1]));
 
-                //var ctp = new Startup.ConnectionStringTemplateParameters(
+                var superUser = new ConnectionStringParameters(
-                //    user: userPass.Split(":")[0],
+                    user: userPass.Split(":")[0],
-                //    pwd: userPass.Split(":")[1]
+                    pwd: userPass.Split(":")[1]
-                //);
+                );
-                //_container = new Startup().ConfigureContainer(ctp);
 
-                if (IsSuperAdmin())
+                if (IsSuperAdmin(superUser))
                 {
                     Console.ForegroundColor = ConsoleColor.Green;
                     var sw = new Stopwatch();
 
                     Console.Write("Database.Core.DCL.SetupDbAdmin...");
                     sw.Start();
-                    
-                    _setupDbAdmin.With(new SetupDbAdmin.Command { Password = "3911", Schema = "system", User = "heimdall" });
-                    Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
 
+                    _setupDbAdmin.With(new SetupDbAdmin.Command { Password = "3911", Schema = "system", User = "heimdall" }, superUser);
+                    Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
 
                     Console.WriteLine("::");
                     Console.WriteLine("::");
                     Console.Write("Database.Core.DDL.SetupIdentitySystem...");
                     sw.Restart();
 
-                    //create new container with application user, we use that role from now.
+                    //use application user, we use that role from now.
-                    //_container = new Startup().ConfigureContainer(new Startup.ConnectionStringTemplateParameters("heimdall", "3911"));
+                    var connParams = new ConnectionStringParameters(user: "heimdall", pwd: "3911");
 
-                    _setupIdentitySystem.With(new SetupIdentitySystem.Command { Schema = "system" });
+                    _setupIdentitySystem.With(new SetupIdentitySystem.Command { Schema = "system" }, connParams);
                     Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
 
                     Console.WriteLine("::");
                     Console.WriteLine("::");
                     Console.Write("Database.ConfigurationManagementSystem.SetupConfiguration...");
                     sw.Restart();
-					_setupConfiguration.With(new SetupConfiguration.Command());
+                    _setupConfiguration.With(new SetupConfiguration.Command(), connParams);
                     Console.Write($"DONE, took: {sw.ElapsedMilliseconds} ms");
 
 
@@ -210,8 +208,8 @@ namespace PlanTempus.SetupInfrastructure
                     Console.WriteLine("::");
                     Console.Write("Database.Core.DCL.SetupApplicationUser...");
                     sw.Start();
-                    
+
-					_setupApplicationUser.With(new SetupApplicationUser.Command { Password = "3911", Schema = "system", User = "sathumper" });
+                    _setupApplicationUser.With(new SetupApplicationUser.Command { Password = "3911", Schema = "system", User = "sathumper" }, superUser);
                     Console.WriteLine($"DONE, took: {sw.ElapsedMilliseconds} ms");
 
 
@@ -227,6 +225,7 @@ namespace PlanTempus.SetupInfrastructure
             catch (Exception e)
             {
                 Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine();
                 Console.WriteLine(e);
 
             }

SetupInfrastructure/Startup.cs

@@ -6,50 +6,44 @@ using PlanTempus.Database.Core;
 
 namespace PlanTempus.SetupInfrastructure
 {
-	public class Startup
+    public class Startup
-	{
+    {
+        public virtual IConfigurationRoot Configuration()
+        {
+            var configuration = new ConfigurationBuilder()
+                .AddJsonFile("appconfiguration.json")
+                .Build();
 
-		public virtual IConfigurationRoot Configuration()
+            return configuration;
-		{
+        }
-			var configuration = new ConfigurationBuilder()
-				.AddJsonFile("appconfiguration.json")
-				.Build();
 
-			return configuration;
+        public void ConfigureContainer(ContainerBuilder builder)
-		}
+        {
 
-		public void ConfigureContainer(ContainerBuilder builder)
+            var configuration = Configuration();
-		{
 
-			//var builder = new ContainerBuilder();
+            builder.RegisterModule(new Database.ModuleRegistry.DbPostgreSqlModule
-			var configuration = Configuration();
+            {
+                ConnectionString = configuration.GetConnectionString("DefaultConnection")
+            });
+
+            builder.RegisterModule(new TelemetryModule
+            {
+                TelemetryConfig = configuration.GetSection("ApplicationInsights").ToObject<TelemetryConfig>()
+            });
+
+            builder.RegisterModule(new SeqLoggingModule
+            {
+                SeqConfiguration = configuration.GetSection("SeqConfiguration").ToObject<Core.Logging.SeqConfiguration>()
+            });
 
 
-			builder.RegisterModule(new Database.ModuleRegistry.DbPostgreSqlModule
+            builder.RegisterAssemblyTypes(typeof(IDbConfigure<>).Assembly)
-			{
+                .AsClosedTypesOf(typeof(IDbConfigure<>))
-				ConnectionString = configuration.GetConnectionString("DefaultConnection")
+                .AsSelf();
-			});
 
-			builder.RegisterModule(new TelemetryModule
+            builder.RegisterType<ConsoleService>();
-			{
-				TelemetryConfig = configuration.GetSection("ApplicationInsights").ToObject<TelemetryConfig>()
-			});
 
-			builder.RegisterModule(new SeqLoggingModule
+        }
-			{
+    }
-				SeqConfiguration = configuration.GetSection("SeqConfiguration").ToObject<Core.Logging.SeqConfiguration>()
-			});
-
-
-			builder.RegisterAssemblyTypes(typeof(IDbConfigure<>).Assembly)
-				.AsClosedTypesOf(typeof(IDbConfigure<>))
-				.AsSelf();
-
-			builder.RegisterType<ConsoleService>();
-
-
-			//return builder.Build();
-		}
-
-	}
 }

SetupInfrastructure/appconfiguration.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptmain;User Id={usr};Password={pwd};"
+    "DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptmain;"
   },
   "ApplicationInsights": {
     "ConnectionString": "InstrumentationKey=07d2a2b9-5e8e-4924-836e-264f8438f6c5;IngestionEndpoint=https://northeurope-2.in.applicationinsights.azure.com/;LiveEndpoint=https://northeurope.livediagnostics.monitor.azure.com/;ApplicationId=56748c39-2fa3-4880-a1e2-24068e791548",

SqlManagement/.dbeaver/.project-metadata.json.bak

@@ -1 +1 @@
-{"resources":{"Scripts/Script-1.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/Script.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44"},"Scripts/SmartConfigSystem.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptdb01"},"Scripts/grant-privileges.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"}}}
+{"resources":{"Scripts/Script-1.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/Script.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"},"Scripts/SmartConfigSystem.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptdb01"},"Scripts/grant-privileges.sql":{"default-datasource":"postgres-jdbc-1948450a8b4-5fc9eec404e65c44","default-catalog":"ptmain"}}}

SqlManagement/Scripts/Script.sql

@@ -36,5 +36,6 @@ SHOW search_path;
 create table system.foos(id int)
 
 select * from system.foo
+select * from "system".organizations
 
 

Tests/ConfigurationTests/JsonConfigurationProviderTests.cs

@@ -132,7 +132,7 @@ namespace PlanTempus.Tests.ConfigurationTests
         }
     }
 
-    public class Feature
+    internal class Feature
     {
         public bool Enabled { get; set; }
         public int RolloutPercentage { get; set; }