add postgres

This commit is contained in:
Alex Bezdieniezhnykh
2024-11-12 15:57:36 +02:00
parent 85139b4fd2
commit 2336c15aa4
15 changed files with 224 additions and 78 deletions
+7
View File
@@ -9,6 +9,13 @@
<ItemGroup>
<PackageReference Include="FluentValidation" Version="11.10.0" />
<PackageReference Include="linq2db" Version="5.4.1" />
<PackageReference Include="Npgsql" Version="8.0.5" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Extensions.Options">
<HintPath>C:\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.8\Microsoft.Extensions.Options.dll</HintPath>
</Reference>
</ItemGroup>
</Project>
@@ -3,4 +3,5 @@
public class ConnectionStrings
{
public string AzaionDb { get; set; } = null!;
public string AzaionDbAdmin { get; set; } = null!;
}
+2 -1
View File
@@ -4,5 +4,6 @@ public class JwtConfig
{
public string Issuer { get; set; } = null!;
public string Audience { get; set; } = null!;
public string Secret { get; set; }
public string Secret { get; set; } = null!;
public double TokenLifetimeHours { get; set; }
}
@@ -10,11 +10,19 @@ public static class AzaionDbSchemaHolder
static AzaionDbSchemaHolder()
{
MappingSchema = new MappingSchema();
MappingSchema.EntityDescriptorCreatedCallback = (_, entityDescriptor) =>
{
foreach (var entityDescriptorColumn in entityDescriptor.Columns)
entityDescriptorColumn.ColumnName = entityDescriptorColumn.ColumnName.ToSnakeCase();
};
var builder = new FluentMappingBuilder(MappingSchema);
builder.Entity<User>()
.HasTableName("users")
.HasIdentity(x => x.Id);
.HasIdentity(x => x.Id)
.Property(x => x.Role).HasConversion(v => v.ToString(), v => (RoleEnum)Enum.Parse(typeof(RoleEnum), v));
builder.Build();
}
+23 -14
View File
@@ -1,5 +1,7 @@
using System.Diagnostics;
using Azaion.Common.Configs;
using LinqToDB;
using Microsoft.Extensions.Options;
namespace Azaion.Common.Database;
@@ -7,42 +9,49 @@ public interface IDbFactory
{
Task<T> Run<T>(Func<AzaionDb, Task<T>> func);
Task Run(Func<AzaionDb, Task> func);
T Run<T>(Func<AzaionDb, T> func);
Task RunAdmin(Func<AzaionDb, Task> func);
}
public class DbFactory : IDbFactory
{
private readonly DataOptions _dataOptions;
private readonly DataOptions _dataOptionsAdmin;
public DbFactory(string connectionString, bool useTracing = true, bool msSql = false)
public DbFactory(IOptions<ConnectionStrings> connectionString)
{
if (string.IsNullOrEmpty(connectionString))
throw new ArgumentException("Empty connectionString", nameof(connectionString));
_dataOptions = LoadOptions(connectionString.Value.AzaionDb);
_dataOptionsAdmin = LoadOptions(connectionString.Value.AzaionDbAdmin);
}
_dataOptions = new DataOptions()
.UsePostgreSQL(connectionString)
private DataOptions LoadOptions(string connStr)
{
if (string.IsNullOrEmpty(connStr))
throw new ArgumentException($"Empty connection string in config!");
var dataOptions = new DataOptions()
.UsePostgreSQL(connStr)
.UseMappingSchema(AzaionDbSchemaHolder.MappingSchema);
if (useTracing)
_ = _dataOptions.UseTracing(TraceLevel.Info, t => Console.WriteLine(t.SqlText));
_ = dataOptions.UseTracing(TraceLevel.Info, t => Console.WriteLine(t.SqlText));
return dataOptions;
}
public async Task<T> Run<T>(Func<AzaionDb, Task<T>> func)
{
await using var db = new AzaionDb(_dataOptions);
return await func(db);
}
public async Task Run(Func<AzaionDb, Task> func)
{
await using var db = new AzaionDb(_dataOptions);
await func(db);
}
public T Run<T>(Func<AzaionDb, T> func)
public async Task RunAdmin(Func<AzaionDb, Task> func)
{
using var db = new AzaionDb(_dataOptions);
return func(db);
await using var db = new AzaionDb(_dataOptionsAdmin);
await func(db);
}
}
+1 -1
View File
@@ -2,7 +2,7 @@
public class User
{
public string Id { get; set; } = null!;
public Guid Id { get; set; }
public string Email { get; set; } = null!;
public string PasswordHash { get; set; } = null!;
public string HardwareId { get; set; } = null!;
+28
View File
@@ -0,0 +1,28 @@
using System.Text;
namespace Azaion.Common;
public static class StringExtensions
{
public static string ToSnakeCase(this string text)
{
if (string.IsNullOrEmpty(text))
return text;
if (text.Length < 2)
return text.ToLowerInvariant();
var sb = new StringBuilder();
sb.Append(char.ToLowerInvariant(text[0]));
for (int i = 1; i < text.Length; ++i) {
var c = text[i];
if(char.IsUpper(c)) {
sb.Append('_');
sb.Append(char.ToLowerInvariant(c));
} else {
sb.Append(c);
}
}
return sb.ToString();
}
}