Janus007/PlanTempusApp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conforming all these db calls

Browse source
This commit is contained in:
Janus C. H. Knudsen 2025-02-06 23:46:55 +01:00
parent 5ca874abe9
commit 05d6977a76
17 changed files with 337 additions and 414 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Core/Telemetry/DebugTelemetryChannel.cs
View file

@ -6,13 +6,24 @@ namespace Core.Telemetry
{
private readonly string _filePath;
public ITelemetryChannel _defaultChannel;
static HttpClient _client = new HttpClient();
public DebugTelemetryChannel(string filePath)
{
_client.BaseAddress = new Uri("http://localhost:5341");
_filePath = filePath;
}
public new void Send(ITelemetry telemetry)
{
var l = new SeqLogger(_client, "", "");
//await l.LogToSeq(
// "Bruger {UserId} loggede ind",
// "Debug",
// new Dictionary<string, object> { { "UserId", "12345" }, { "Counter", i++ } }
// );
if (telemetry is Microsoft.ApplicationInsights.DataContracts.TraceTelemetry trace)
{
var severity = trace.SeverityLevel;

4
Database/ConfigurationManagementSystem/ConfigurationDatabaseSetup.cs → Database/ConfigurationManagementSystem/SetupConfiguration.cs
View file

@ -3,11 +3,11 @@ using System.Data;
namespace Database.ConfigurationManagementSystem;
public class ConfigurationDatabaseSetup
public class SetupConfiguration
{
private readonly IDbConnection _connection;
public ConfigurationDatabaseSetup(IDbConnection connection)
public SetupConfiguration(IDbConnection connection)
{
_connection = connection;
}

6
Database/Core/SetupIdentitySystem.cs
View file

@ -1,7 +1,7 @@
using Insight.Database;
using System.Data;
namespace Database.IdentitySystem
namespace Database.Core
{
public interface IDbSetup
{
@ -11,13 +11,13 @@ namespace Database.IdentitySystem
/// <summary>
/// This is by purpose not async await
/// </summary>
public class DbSetup : IDbSetup
public class SetupIdentitySystem : IDbSetup
{
readonly IDbConnection _db;
IDbTransaction _transaction = null;
string _schema;
public DbSetup(IDbConnection db)
public SetupIdentitySystem(IDbConnection db)
{
_db = db;
}

62
Database/Core/SetupUser.cs
View file

@ -1,62 +0,0 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Insight.Database;
namespace Database.Core
{
public class SetupUser
{
private readonly IDbConnection _db;
public SetupUser(IDbConnection db)
{
_db = db;
}
public async Task CreateTenantInDatabase(string schema, string user, string password)
{
if (!Regex.IsMatch(schema, "^[a-zA-Z0-9_]+$"))
throw new ArgumentException("Invalid schema name");
await CreateUser(user, password);
await CreateSchema(schema);
await GrantSchemaRights(schema, user);
await CreateNavigationLinkTemplatesTable(schema);
await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateSchema(string schema)
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {schema}";
await _db.ExecuteAsync(sql);
}
private async Task CreateUser(string user, string password)
{
var sql = $"CREATE USER {user} WITH PASSWORD '{password}';";
await _db.ExecuteAsync(sql);
}
private async Task GrantSchemaRights(string schema, string user)
{
var sql = $"GRANT USAGE ON SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {schema} " +
$"GRANT ALL PRIVILEGES ON TABLES TO {user};";
await _db.ExecuteAsync(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql2);
}
}
}

2
Database/Core/UserService.cs
View file

@ -2,7 +2,7 @@
using Insight.Database;
using System.Data;
namespace Database.IdentitySystem
namespace Database.Core
{
public class UserService
{

1
Database/Database.csproj
View file

@ -11,7 +11,6 @@
<ItemGroup>
<Folder Include="AuditSystem\" />
<Folder Include="NavigationSystem\" />
</ItemGroup>
</Project>

12
Database/RolesPermissionSystem/NavigationSystem.cs → Database/NavigationSystem/Setup.cs
View file

@ -1,18 +1,22 @@
using Insight.Database;
using System.Data;
namespace Database.RolesPermissionSystem
namespace Database.NavigationSystem
{
internal class NavigationSystem
internal class Setup
{
private readonly IDbConnection _db;
public NavigationSystem(IDbConnection db)
public Setup(IDbConnection db)
{
_db = db;
}
public void CreateSystem()
{
//await CreateNavigationLinkTemplatesTable(schema);
//await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateNavigationLinkTemplatesTable(string schema)
{

57
Database/RolesPermissionSystem/Setup.cs
View file

@ -1,5 +1,4 @@
using System.Data;
using System.Text.RegularExpressions;
using Database.Common;
using Insight.Database;
@ -7,11 +6,12 @@ namespace Database.RolesPermissionSystem
{
public class Setup
{
private readonly IDbConnection _db;
IDbConnection _db;
string _schema;
public Setup(IDbConnection db)
{
_db = db ?? throw new ArgumentNullException(nameof(db));
_db = db;
}
/// <summary>
@ -20,17 +20,19 @@ namespace Database.RolesPermissionSystem
/// <param name="schema">The schema name where the tables will be created.</param>
public void CreateSystem(string schema)
{
if (!Validations.IsValidSchemaName(schema))
throw new ArgumentException("Invalid schema name", nameof(schema));
_schema = schema;
if (!Validations.IsValidSchemaName(_schema))
throw new ArgumentException("Invalid schema name", _schema);
using (var transaction = _db.BeginTransaction())
{
try
{
CreateRolesTable(schema, transaction);
CreatePermissionsTable(schema, transaction);
CreatePermissionTypesTable(schema, transaction);
CreateRolePermissionsTable(schema, transaction);
CreateRolesTable();
CreatePermissionsTable();
CreatePermissionTypesTable();
CreateRolePermissionsTable();
transaction.Commit();
}
@ -43,57 +45,54 @@ namespace Database.RolesPermissionSystem
}
private void ExecuteSql(string sql, IDbTransaction transaction)
private void ExecuteSql(string sql)
{
if (string.IsNullOrEmpty(sql))
throw new ArgumentNullException(nameof(sql));
_db.Execute(sql, transaction: transaction);
_db.ExecuteSql(sql);
}
private void CreatePermissionTypesTable(string schema, IDbTransaction transaction)
private void CreatePermissionTypesTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.permission_types (
CREATE TABLE IF NOT EXISTS {_schema}.permission_types (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE
)";
ExecuteSql(sql, transaction);
ExecuteSql(sql);
}
private void CreatePermissionsTable(string schema, IDbTransaction transaction)
private void CreatePermissionsTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.permissions (
CREATE TABLE IF NOT EXISTS {_schema}.permissions (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE,
type_id INTEGER NOT NULL,
FOREIGN KEY (type_id) REFERENCES {schema}.permission_types(id)
FOREIGN KEY (type_id) REFERENCES {_schema}.permission_types(id)
)";
ExecuteSql(sql, transaction);
ExecuteSql(sql);
}
private void CreateRolesTable(string schema, IDbTransaction transaction)
private void CreateRolesTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.roles (
CREATE TABLE IF NOT EXISTS {_schema}.roles (
id SERIAL PRIMARY KEY,
name VARCHAR(100) NOT NULL UNIQUE
)";
ExecuteSql(sql, transaction);
ExecuteSql(sql);
}
private void CreateRolePermissionsTable(string schema, IDbTransaction transaction)
private void CreateRolePermissionsTable()
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.role_permissions (
CREATE TABLE IF NOT EXISTS {_schema}.role_permissions (
role_id INTEGER NOT NULL,
permission_id INTEGER NOT NULL,
PRIMARY KEY (role_id, permission_id),
FOREIGN KEY (role_id) REFERENCES {schema}.roles(id),
FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id)
FOREIGN KEY (role_id) REFERENCES {_schema}.roles(id),
FOREIGN KEY (permission_id) REFERENCES {_schema}.permissions(id)
)";
ExecuteSql(sql, transaction);
ExecuteSql(sql);
}
}
}

88
Database/Tenants/Setup.cs Normal file
View file

@ -0,0 +1,88 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Database.Common;
using Insight.Database;
namespace Database.Tenants
{
public class Setup
{
IDbConnection _db;
string _schema;
string _user;
string _password;
public Setup(IDbConnection db)
{
_db = db;
}
public void CreateUserWithSchemaInDatabase(string schema, string user, string password)
{
_schema = schema;
_password = password;
_user = user;
if (!Validations.IsValidSchemaName(_schema))
throw new ArgumentException("Invalid schema name", _schema);
using (var transaction = _db.BeginTransaction())
{
try
{
CreateSchema();
CreateRole();
GrantSchemaRights();
transaction.Commit();
}
catch (Exception ex)
{
transaction.Rollback();
throw new InvalidOperationException("Failed to CreateUserWithSchemaInDatabase", ex);
}
}
}
private void ExecuteSql(string sql)
{
_db.ExecuteSql(sql);
}
private void CreateSchema()
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {_schema}";
ExecuteSql(sql);
}
private void CreateRole()
{
var sql = $"CREATE ROLE {_user} LOGIN PASSWORD '{_password}';";
ExecuteSql(sql);
var sql1 = $"ALTER ROLE {_user} SET search_path='{_schema}';";
ExecuteSql(sql1);
}
private void GrantSchemaRights()
{
var sql = $"GRANT USAGE ON SCHEMA {_schema} TO {_user};";
ExecuteSql(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {_schema} " +
$"GRANT INSERT, SELECT, UPDATE PRIVILEGES ON TABLES TO {_user};";
ExecuteSql(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {_schema} TO {_user};";
ExecuteSql(sql2);
}
}
}

133
Database/Tenants/TenantSetupService.cs
View file

@ -1,133 +0,0 @@
using System;
using System.Data;
using System.Text.RegularExpressions;
using Insight.Database;
namespace Database.Tenants
{
public class Setup
{
private readonly IDbConnection _db;
public Setup(IDbConnection db)
{
_db = db;
}
public async Task CreateTenantInDatabase(string schema, string user, string password)
{
if (!Regex.IsMatch(schema, "^[a-zA-Z0-9_]+$"))
throw new ArgumentException("Invalid schema name");
await CreateUser(user, password);
await CreateSchema(schema);
await GrantSchemaRights(schema, user);
await CreateNavigationLinkTemplatesTable(schema);
await CreateNavigationLinkTemplateTranslationsTable(schema);
}
private async Task CreateSchema(string schema)
{
var sql = $"CREATE SCHEMA IF NOT EXISTS {schema}";
await _db.ExecuteAsync(sql);
}
private async Task CreateUser(string user, string password)
{
var sql = $"CREATE USER {user} WITH PASSWORD '{password}';";
await _db.ExecuteAsync(sql);
}
private async Task GrantSchemaRights(string schema, string user)
{
var sql = $"GRANT USAGE ON SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql);
var sql1 = $"ALTER DEFAULT PRIVILEGES IN SCHEMA {schema} " +
$"GRANT ALL PRIVILEGES ON TABLES TO {user};";
await _db.ExecuteAsync(sql1);
var sql2 = $"GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA {schema} TO {user};";
await _db.ExecuteAsync(sql2);
}
//private async Task CreatePermissionTypesTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.permission_types (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreatePermissionsTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.permissions (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE,
// type_id INTEGER NOT NULL,
// FOREIGN KEY (type_id) REFERENCES {schema}.permission_types(id)
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreateRolesTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.roles (
// id SERIAL PRIMARY KEY,
// name VARCHAR(100) NOT NULL UNIQUE
// )";
// await _db.ExecuteAsync(sql);
//}
//private async Task CreateRolePermissionsTable(string schema)
//{
// var sql = $@"
// CREATE TABLE IF NOT EXISTS {schema}.role_permissions (
// role_id INTEGER NOT NULL,
// permission_id INTEGER NOT NULL,
// PRIMARY KEY (role_id, permission_id),
// FOREIGN KEY (role_id) REFERENCES {schema}.roles(id),
// FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id)
// )";
// await _db.ExecuteAsync(sql);
//}
private async Task CreateNavigationLinkTemplatesTable(string schema)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.navigation_link_templates (
id SERIAL PRIMARY KEY,
parent_id INTEGER NULL,
url VARCHAR(500) NOT NULL,
permission_id INTEGER NULL,
icon VARCHAR(100) NULL,
default_order INTEGER NOT NULL,
FOREIGN KEY (permission_id) REFERENCES {schema}.permissions(id),
FOREIGN KEY (parent_id) REFERENCES {schema}.navigation_link_templates(id)
)";
await _db.ExecuteAsync(sql);
}
private async Task CreateNavigationLinkTemplateTranslationsTable(string schema)
{
var sql = $@"
CREATE TABLE IF NOT EXISTS {schema}.navigation_link_template_translations (
id SERIAL PRIMARY KEY,
template_id INTEGER NOT NULL,
language VARCHAR(10) NOT NULL,
display_name VARCHAR(100) NOT NULL,
FOREIGN KEY (template_id) REFERENCES {schema}.navigation_link_templates(id)
)";
await _db.ExecuteAsync(sql);
}
}
}

25
SetupInfrastructure/Program.cs
View file

@ -12,22 +12,37 @@ namespace SetupInfrastructure
/// After that is executed it is time for running this main program
/// Remember to use the newly created sathumper
/// "ConnectionStrings": {
/// "ptdb": "Host=192.168.1.57;Port=5432;Database=ptdb01;User Id=sathumper;Password=<secret>;"
/// "DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptdb01;User Id=sathumper;Password=<secret>;"
/// </summary>
internal class Program
{
static async Task Main(string[] args)
{
var container = new Startup().ConfigureContainer();
string userPass;
do
{
Console.WriteLine("Input username:password");
userPass = Console.ReadLine() ?? string.Empty;
} while (!userPass.Contains(":") || userPass.Split(":").Length != 2 ||
string.IsNullOrEmpty(userPass.Split(":")[0]) ||
string.IsNullOrEmpty(userPass.Split(":")[1]));
var ctp = new Startup.ConnectionStringTemplateParameters(
user: userPass.Split(":")[0],
pwd: userPass.Split(":")[1]
);
var container = new Startup().ConfigureContainer(ctp);
// SetupIdentitySystem
// ConfigurationDatabaseSetup
// input configurations!!! TODO:Missing
container.Resolve
}
}
}

6
SetupInfrastructure/Startup.cs
View file

@ -16,7 +16,7 @@ namespace SetupInfrastructure
return configuration;
}
public IContainer ConfigureContainer()
public IContainer ConfigureContainer(ConnectionStringTemplateParameters ctp)
{
var builder = new ContainerBuilder();
var configuration = Configuration();
@ -24,7 +24,7 @@ namespace SetupInfrastructure
builder.RegisterModule(new Core.ModuleRegistry.DbPostgreSqlModule
{
ConnectionString = configuration.GetConnectionString("DefaultConnection")
ConnectionString = configuration.GetConnectionString("DefaultConnection").Replace("{usr}", ctp.user).Replace("{pwd}", ctp.pwd)
});
builder.RegisterModule(new Core.ModuleRegistry.TelemetryModule
@ -35,5 +35,7 @@ namespace SetupInfrastructure
return builder.Build();
}
public record ConnectionStringTemplateParameters(string user, string pwd);
}
}

2
SetupInfrastructure/appconfiguration.json
View file

@ -1,7 +1,7 @@
{
"AllowedHosts": "*",
"ConnectionStrings": {
"DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptdb01;User Id=sathumper;Password=3911;"
"DefaultConnection": "Host=192.168.1.57;Port=5432;Database=ptdb01;User Id={usr};Password={pwd};"
},
"ApplicationInsights": {
"ConnectionString": "InstrumentationKey=6d2e76ee-5343-4691-a5e3-81add43cb584;IngestionEndpoint=https://northeurope-0.in.applicationinsights.azure.com/"

2
SqlManagement/.dbeaver/.project-metadata.json.bak
View file

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

2
SqlManagement/.dbeaver/project-metadata.json
View file

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

0
SqlManagement/Scripts/Script.sql → SqlManagement/Scripts/Script-1.sql
View file

4
Tests/PostgresTests.cs
View file

@ -59,8 +59,8 @@ namespace Tests
{
var conn = Container.Resolve<IDbConnection>();
var dbSetup = new Database.IdentitySystem.DbSetup(conn);
await dbSetup.CreateSystem("swp");
var identitySystem = new Database.Core.SetupIdentitySystem(conn);
identitySystem.CreateSystem("swp");
}
[TestMethod]