jbourdon/social-media
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed database provider to Postgres since it handle UUID/GUID correctly

Browse Source
This commit is contained in:
Jonathan Bourdon
2024-07-18 00:03:19 -04:00
parent 769586cc15
commit a8b7860fd8
26 changed files with 107 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Directory.Packages.props
View File

@@ -37,6 +37,7 @@
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="Moq" Version="4.20.69" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.0.3" />
<PackageVersion Include="NSwag.MSBuild" Version="14.0.3" />
<PackageVersion Include="nunit" Version="3.14.0" />

4
src/Infrastructure/DependencyInjection.cs
View File

@@ -21,8 +21,8 @@ public static class DependencyInjection
{
// Replace password in the connection string with env var in local environment.
// Prod will use the connectionString stored in the vault with password in it directly.
var connectionString = configuration.GetConnectionString("DefaultConnection")
?? throw new InvalidOperationException("Missing ConnectionString: DefaultConnection");
var connectionString = configuration.GetConnectionString("MssqlConnection")
?? throw new InvalidOperationException("Missing ConnectionStrings:MssqlConnection");
services.AddScoped<ISaveChangesInterceptor, AuditableEntityInterceptor>();
services.AddScoped<ISaveChangesInterceptor, DispatchDomainEventsInterceptor>();

9
src/Web/Contents/Data/Content.cs
View File

@@ -4,10 +4,9 @@ public class Content
{
public Guid Id { get; init; }
public Guid CreatedBy { get; init; }
public DateTime CreatedAt { get; }
public DateTimeOffset CreatedAt { get; }
public string? Title { get; init; } = null!;
public string? Description { get; init; } = null!;
public string? Uri { get; init; } = null!;
public string? Title { get; init; }
public string? Description { get; init; }
public string? Uri { get; init; }
}

4
src/Web/Contents/Handlers/GetContentsByUser.cs
View File

@@ -31,9 +31,9 @@ public class GetContentsByUser(
.Where(c => c.CreatedBy == req.UserId);
if (req.LastId is not null)
query = query.OrderBy(c => c.Id).Where(c => c.Id > req.LastId.Value);
query = query.OrderByDescending(c => c.Id).Where(c => c.Id < req.LastId.Value);
else
query = query.OrderBy(c => c.Id);
query = query.OrderByDescending(c => c.Id);
query = query.Take(req.MaxItems);

1
src/Web/Contents/Handlers/PostContent.cs
View File

@@ -26,6 +26,7 @@ public class PostContent(
await context.Contents.AddAsync(
new Content
{
Id = GuidHelper.GenerateUuidV7(),
CreatedBy = User.GetUserId(),
Title = req.Title,
Description = req.Description,

58
src/Web/Contents/Migrations/20240702034957_Initial.Designer.cs generated
View File

@@ -1,58 +0,0 @@
// <auto-generated />
using System;
using Hutopy.Web.Contents.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Hutopy.Web.Contents.Migrations
{
[DbContext(typeof(ContentDbContext))]
[Migration("20240702034957_Initial")]
partial class Initial
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Contents.Data.Content", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
b.Property<string>("Description")
.HasColumnType("nvarchar(max)");
b.Property<string>("Title")
.HasColumnType("nvarchar(max)");
b.Property<string>("Uri")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Contents");
});
#pragma warning restore 612, 618
}
}
}

31
src/Web/Contents/Migrations/20240707030928_ChangingContentDefaultSchema.cs
View File

@@ -1,31 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Hutopy.Web.Contents.Migrations
{
/// <inheritdoc />
public partial class ChangingContentDefaultSchema : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.EnsureSchema(
name: "Content");
migrationBuilder.RenameTable(
name: "Contents",
newName: "Contents",
newSchema: "Content");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameTable(
name: "Contents",
schema: "Content",
newName: "Contents");
}
}
}

26
src/Web/Contents/Migrations/20240707030928_ChangingContentDefaultSchema.Designer.cs → src/Web/Contents/Migrations/20240718034516_Initial.Designer.cs generated
View File

@@ -3,17 +3,17 @@ using System;
using Hutopy.Web.Contents.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Hutopy.Web.Contents.Migrations
{
[DbContext(typeof(ContentDbContext))]
[Migration("20240707030928_ChangingContentDefaultSchema")]
partial class ChangingContentDefaultSchema
[Migration("20240718034516_Initial")]
partial class Initial
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -21,33 +21,33 @@ namespace Hutopy.Web.Contents.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Content")
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Contents.Data.Content", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
b.Property<DateTimeOffset>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<string>("Description")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("Title")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("Uri")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");

19
src/Web/Contents/Migrations/20240702034957_Initial.cs → src/Web/Contents/Migrations/20240718034516_Initial.cs
View File

@@ -11,16 +11,20 @@ namespace Hutopy.Web.Contents.Migrations
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.EnsureSchema(
name: "Content");
migrationBuilder.CreateTable(
name: "Contents",
schema: "Content",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreatedBy = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP"),
Title = table.Column<string>(type: "nvarchar(max)", nullable: true),
Description = table.Column<string>(type: "nvarchar(max)", nullable: true),
Uri = table.Column<string>(type: "nvarchar(max)", nullable: true)
Id = table.Column<Guid>(type: "uuid", nullable: false),
CreatedBy = table.Column<Guid>(type: "uuid", nullable: false),
CreatedAt = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP"),
Title = table.Column<string>(type: "text", nullable: true),
Description = table.Column<string>(type: "text", nullable: true),
Uri = table.Column<string>(type: "text", nullable: true)
},
constraints: table =>
{
@@ -32,7 +36,8 @@ namespace Hutopy.Web.Contents.Migrations
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Contents");
name: "Contents",
schema: "Content");
}
}
}

22
src/Web/Contents/Migrations/ContentDbContextModelSnapshot.cs
View File

@@ -3,8 +3,8 @@ using System;
using Hutopy.Web.Contents.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
@@ -18,33 +18,33 @@ namespace Hutopy.Web.Contents.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Content")
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Contents.Data.Content", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
b.Property<DateTimeOffset>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<string>("Description")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("Title")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.Property<string>("Uri")
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");

4
src/Web/Messages/Data/Message.cs
View File

@@ -5,7 +5,7 @@ public class Message
public Guid Id { get; init; }
public Guid SubjectId { get; init; }
public Guid CreatedBy { get; init; }
public DateTime CreatedAt { get; }
public DateTimeOffset CreatedAt { get; }
public Guid ParentId { get; init; }
public string Value { get; init; } = null!;
public string Value { get; init; }
}

2
src/Web/Messages/Data/MessagingDbContext.cs
View File

@@ -17,5 +17,5 @@ public class MessagingDbContext(
.HasDefaultValueSql("CURRENT_TIMESTAMP");
}
public DbSet<Message> Messages { get; set; }
public DbSet<Message> Messages { get; set; }
}

11
src/Web/Messages/Handlers/PostMessage.cs
View File

@@ -23,10 +23,13 @@ public class PostMessage(
CancellationToken ct)
{
await context.Messages.AddAsync(
new Message {
SubjectId = req.SubjectId,
CreatedBy = User.GetUserId(),
Value = req.Message },
new Message
{
Id = GuidHelper.GenerateUuidV7(),
SubjectId = req.SubjectId,
CreatedBy = User.GetUserId(),
Value = req.Message
},
ct);
await context.SaveChangesAsync(ct);

1
src/Web/Messages/Handlers/PostReplyMessage.cs
View File

@@ -26,6 +26,7 @@ public sealed class PostReplyMessage(
await context.Messages.AddAsync(
new Message
{
Id = GuidHelper.GenerateUuidV7(),
SubjectId = req.SubjectId,
ParentId = req.ParentId,
CreatedBy = User.GetUserId(),

59
src/Web/Messages/Migrations/20240627081653_Initial.Designer.cs generated
View File

@@ -1,59 +0,0 @@
// <auto-generated />
using System;
using Hutopy.Web.Messages.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Hutopy.Web.Messages.Migrations
{
[DbContext(typeof(MessagingDbContext))]
[Migration("20240627081653_Initial")]
partial class Initial
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Messages.Data.Message", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ContentId")
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
b.Property<Guid>("ParentId")
.HasColumnType("uniqueidentifier");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Messages");
});
#pragma warning restore 612, 618
}
}
}

58
src/Web/Messages/Migrations/20240707023204_UseSubjectId_InsteadOfContentId.Designer.cs generated
View File

@@ -1,58 +0,0 @@
// <auto-generated />
using System;
using Hutopy.Web.Contents.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace Hutopy.Web.Messages.Migrations
{
[DbContext(typeof(ContentDbContext))]
[Migration("20240707023204_UseSubjectId_InsteadOfContentId")]
partial class UseSubjectId_InsteadOfContentId
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Contents.Data.Content", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<DateTime>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
b.Property<string>("Description")
.HasColumnType("nvarchar(max)");
b.Property<string>("Title")
.HasColumnType("nvarchar(max)");
b.Property<string>("Uri")
.HasColumnType("nvarchar(max)");
b.HasKey("Id");
b.ToTable("Contents");
});
#pragma warning restore 612, 618
}
}
}

22
src/Web/Messages/Migrations/20240707023204_UseSubjectId_InsteadOfContentId.cs
View File

@@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Hutopy.Web.Messages.Migrations
{
/// <inheritdoc />
public partial class UseSubjectId_InsteadOfContentId : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

42
src/Web/Messages/Migrations/20240707030834_ChangingMessagingDefaultSchema.cs
View File

@@ -1,42 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Hutopy.Web.Messages.Migrations
{
/// <inheritdoc />
public partial class ChangingMessagingDefaultSchema : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.EnsureSchema(
name: "Messaging");
migrationBuilder.RenameTable(
name: "Messages",
newName: "Messages",
newSchema: "Messaging");
migrationBuilder.RenameColumn(
name: "ContentId",
schema: "Messaging",
table: "Messages",
newName: "SubjectId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameTable(
name: "Messages",
schema: "Messaging",
newName: "Messages");
migrationBuilder.RenameColumn(
name: "SubjectId",
table: "Messages",
newName: "ContentId");
}
}
}

26
src/Web/Messages/Migrations/20240707030834_ChangingMessagingDefaultSchema.Designer.cs → src/Web/Messages/Migrations/20240718041130_Initial.Designer.cs generated
View File

@@ -3,17 +3,17 @@ using System;
using Hutopy.Web.Messages.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
namespace Hutopy.Web.Messages.Migrations
{
[DbContext(typeof(MessagingDbContext))]
[Migration("20240707030834_ChangingMessagingDefaultSchema")]
partial class ChangingMessagingDefaultSchema
[Migration("20240718041130_Initial")]
partial class Initial
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
@@ -21,34 +21,34 @@ namespace Hutopy.Web.Messages.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Messaging")
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Messages.Data.Message", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
b.Property<DateTimeOffset>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<Guid>("ParentId")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<Guid>("SubjectId")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");

19
src/Web/Messages/Migrations/20240627081653_Initial.cs → src/Web/Messages/Migrations/20240718041130_Initial.cs
View File

@@ -11,16 +11,20 @@ namespace Hutopy.Web.Messages.Migrations
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.EnsureSchema(
name: "Messaging");
migrationBuilder.CreateTable(
name: "Messages",
schema: "Messaging",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
ContentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreatedBy = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP"),
ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
Value = table.Column<string>(type: "nvarchar(max)", nullable: false)
Id = table.Column<Guid>(type: "uuid", nullable: false),
SubjectId = table.Column<Guid>(type: "uuid", nullable: false),
CreatedBy = table.Column<Guid>(type: "uuid", nullable: false),
CreatedAt = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, defaultValueSql: "CURRENT_TIMESTAMP"),
ParentId = table.Column<Guid>(type: "uuid", nullable: false),
Value = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
@@ -32,7 +36,8 @@ namespace Hutopy.Web.Messages.Migrations
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Messages");
name: "Messages",
schema: "Messaging");
}
}
}

22
src/Web/Messages/Migrations/MessagingDbContextModelSnapshot.cs
View File

@@ -3,8 +3,8 @@ using System;
using Hutopy.Web.Messages.Data;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
@@ -18,34 +18,34 @@ namespace Hutopy.Web.Messages.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasDefaultSchema("Messaging")
.HasAnnotation("ProductVersion", "8.0.3")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
modelBuilder.Entity("Hutopy.Web.Messages.Data.Message", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<DateTime>("CreatedAt")
b.Property<DateTimeOffset>("CreatedAt")
.ValueGeneratedOnAdd()
.HasColumnType("datetime2")
.HasColumnType("timestamp with time zone")
.HasDefaultValueSql("CURRENT_TIMESTAMP");
b.Property<Guid>("CreatedBy")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<Guid>("ParentId")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<Guid>("SubjectId")
.HasColumnType("uniqueidentifier");
.HasColumnType("uuid");
b.Property<string>("Value")
.IsRequired()
.HasColumnType("nvarchar(max)");
.HasColumnType("text");
b.HasKey("Id");

8
src/Web/Program.cs
View File

@@ -79,12 +79,12 @@ builder.Services.AddOpenApiDocument((configure, sp) =>
configure.OperationProcessors.Add(new AspNetCoreOperationSecurityScopeProcessor("JWT"));
});
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection")
?? throw new InvalidOperationException("Missing ConnectionStrings:DefaultConnection");
var postgresConnectionString = builder.Configuration.GetConnectionString("PostgresConnection")
?? throw new InvalidOperationException("Missing ConnectionStrings:PostgresConnection");
builder.Services.AddFastEndpoints();
builder.Services.AddContentModule(options => options.UseSqlServer(connectionString));
builder.Services.AddMessagingModule(options => options.UseSqlServer(connectionString));
builder.Services.AddContentModule(options => options.UseNpgsql(postgresConnectionString));
builder.Services.AddMessagingModule(options => options.UseNpgsql(postgresConnectionString));
builder.Services.Configure<JwtOptions>(builder.Configuration.GetRequiredSection(JwtOptions.SectionName));

6
src/Web/Web.csproj
View File

@@ -22,6 +22,7 @@
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="NSwag.AspNetCore" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -30,4 +31,9 @@
<PackageReference Include="FluentValidation.AspNetCore" />
</ItemGroup>
<ItemGroup>
<Folder Include="Contents\Migrations\" />
<Folder Include="Messages\Migrations\" />
</ItemGroup>
</Project>

3
src/Web/appsettings.Development.json
View File

@@ -8,7 +8,8 @@
}
},
"ConnectionStrings": {
"DefaultConnection": "Server=localhost,1433;Initial Catalog=Hutopy;User Id=sa;Password=P@ssword123!;MultipleActiveResultSets=true;TrustServerCertificate=True;MultiSubnetFailover=True"
"MssqlConnection": "Server=localhost,1433;Initial Catalog=Hutopy;User Id=sa;Password=P@ssword123!;MultipleActiveResultSets=true;TrustServerCertificate=True;MultiSubnetFailover=True",
"PostgresConnection": "Server=localhost,5432;Database=Hutopy;Uid=sa;Pwd=P@ssword123!;"
},
"Authentication": {
"Jwt": {

2
tests/Application.FunctionalTests/SqlServerTestDatabase.cs
View File

@@ -20,7 +20,7 @@ public class SqlServerTestDatabase : ITestDatabase
.AddEnvironmentVariables()
.Build();
var connectionString = configuration.GetConnectionString("DefaultConnection");
var connectionString = configuration.GetConnectionString("MssqlConnection");
Guard.Against.Null(connectionString);

2
tests/Application.FunctionalTests/appsettings.json
View File

@@ -1,5 +1,5 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=HutopyTestDb;Trusted_Connection=True;MultipleActiveResultSets=true"
"MssqlConnection": "Server=(localdb)\\mssqllocaldb;Database=HutopyTestDb;Trusted_Connection=True;MultipleActiveResultSets=true"
}
}