Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 83 additions & 80 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,86 +3,89 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Ardalis.Specification" Version="9.3.1"/>
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="9.3.1"/>
<PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.1"/>
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.1"/>
<PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0"/>
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0"/>
<PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="9.0.0"/>
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0"/>
<PackageVersion Include="BCrypt.Net-Next" Version="4.1.0"/>
<PackageVersion Include="DotNet.Testcontainers" Version="1.6.0"/>
<PackageVersion Include="ErrorOr" Version="2.1.0"/>
<PackageVersion Include="Fluid.Core" Version="2.31.0"/>
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1"/>
<PackageVersion Include="HotChocolate.AspNetCore" Version="15.1.13"/>
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="15.1.13"/>
<PackageVersion Include="HotChocolate.Data.EntityFramework" Version="15.1.13"/>
<PackageVersion Include="HotChocolate.Diagnostics" Version="15.1.12"/>
<PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.8.0"/>
<PackageVersion Include="Keycloak.AuthServices.Authorization" Version="2.8.0"/>
<PackageVersion Include="Keycloak.AuthServices.Sdk" Version="2.9.0"/>
<PackageVersion Include="Kot.MongoDB.Migrations" Version="3.1.0"/>
<PackageVersion Include="Kot.MongoDB.Migrations.DI" Version="3.1.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="10.0.5"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.5"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Compliance.Redaction" Version="10.4.0"/>
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0"/>
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Telemetry" Version="10.4.0"/>
<PackageVersion Include="coverlet.collector" Version="8.0.1"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0"/>
<PackageVersion Include="MailKit" Version="4.15.1"/>
<PackageVersion Include="WolverineFx" Version="5.27.0"/>
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.27.0"/>
<PackageVersion Include="WolverineFx.FluentValidation" Version="5.22.0"/>
<PackageVersion Include="WolverineFx.Postgresql" Version="5.27.0"/>
<PackageVersion Include="MimeKit" Version="4.15.1"/>
<PackageVersion Include="MockQueryable.Moq" Version="10.0.5"/>
<PackageVersion Include="MongoDB.Bson" Version="3.7.1"/>
<PackageVersion Include="MongoDB.Driver" Version="3.7.1"/>
<PackageVersion Include="Moq" Version="4.20.72"/>
<PackageVersion Include="NCrontab.Signed" Version="3.3.3"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1"/>
<PackageVersion Include="Npgsql.OpenTelemetry" Version="10.0.2"/>
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.1"/>
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.1"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.1"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0"/>
<PackageVersion Include="Ardalis.Specification" Version="9.3.1" />
<PackageVersion Include="Ardalis.Specification.EntityFrameworkCore" Version="9.3.1" />
<PackageVersion Include="Asp.Versioning.Mvc" Version="8.1.1" />
<PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.1" />
<PackageVersion Include="AspNetCore.HealthChecks.MongoDb" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="BCrypt.Net-Next" Version="4.1.0" />
<PackageVersion Include="DotNet.Testcontainers" Version="1.6.0" />
<PackageVersion Include="ErrorOr" Version="2.1.0" />
<PackageVersion Include="Fluid.Core" Version="2.31.0" />
<PackageVersion Include="FluentValidation" Version="12.1.1" />
<PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="15.1.13" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="15.1.13" />
<PackageVersion Include="HotChocolate.Data.EntityFramework" Version="15.1.13" />
<PackageVersion Include="HotChocolate.Diagnostics" Version="15.1.12" />
<PackageVersion Include="JasperFx" Version="1.23.0" />
<PackageVersion Include="Keycloak.AuthServices.Authentication" Version="2.8.0" />
<PackageVersion Include="Keycloak.AuthServices.Authorization" Version="2.8.0" />
<PackageVersion Include="Keycloak.AuthServices.Sdk" Version="2.9.0" />
<PackageVersion Include="Kot.MongoDB.Migrations" Version="3.1.0" />
<PackageVersion Include="Kot.MongoDB.Migrations.DI" Version="3.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
<PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Compliance.Redaction" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.5" />
<PackageVersion Include="Microsoft.Extensions.Telemetry" Version="10.4.0" />
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
<PackageVersion Include="MailKit" Version="4.15.1" />
<PackageVersion Include="Testcontainers.MongoDb" Version="4.11.0" />
<PackageVersion Include="WolverineFx" Version="5.27.0" />
<PackageVersion Include="WolverineFx.EntityFrameworkCore" Version="5.27.0" />
<PackageVersion Include="WolverineFx.FluentValidation" Version="5.22.0" />
<PackageVersion Include="WolverineFx.Postgresql" Version="5.27.0" />
<PackageVersion Include="MimeKit" Version="4.15.1" />
<PackageVersion Include="MockQueryable.Moq" Version="10.0.5" />
<PackageVersion Include="MongoDB.Bson" Version="3.7.1" />
<PackageVersion Include="MongoDB.Driver" Version="3.7.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NCrontab.Signed" Version="3.3.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
<PackageVersion Include="Npgsql.OpenTelemetry" Version="10.0.2" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<!-- These instrumentations are still beta upstream; keep them pinned deliberately until stable releases exist. -->
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.0-beta.1"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.0-beta.1"/>
<PackageVersion Include="Scalar.AspNetCore" Version="2.13.19"/>
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0"/>
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0"/>
<PackageVersion Include="Serilog.Expressions" Version="5.0.0"/>
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0"/>
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0"/>
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1"/>
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0"/>
<PackageVersion Include="StackExchange.Redis" Version="2.12.14"/>
<PackageVersion Include="Shouldly" Version="4.3.0"/>
<PackageVersion Include="SystemTextJsonPatch" Version="5.0.0"/>
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="3.0.0"/>
<PackageVersion Include="Respawn" Version="7.0.0"/>
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.11.0"/>
<PackageVersion Include="TickerQ" Version="10.2.5"/>
<PackageVersion Include="TickerQ.EntityFrameworkCore" Version="10.2.5"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5"/>
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="10.4.0"/>
<PackageVersion Include="xunit.v3" Version="3.2.2"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.0-beta.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.15.0-beta.1" />
<PackageVersion Include="Scalar.AspNetCore" Version="2.13.19" />
<PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="4.2.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="StackExchange.Redis" Version="2.12.14" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="SystemTextJsonPatch" Version="5.0.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="3.0.0" />
<PackageVersion Include="Respawn" Version="7.0.0" />
<PackageVersion Include="Testcontainers.PostgreSql" Version="4.11.0" />
<PackageVersion Include="TickerQ" Version="10.2.5" />
<PackageVersion Include="TickerQ.EntityFrameworkCore" Version="10.2.5" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="Microsoft.Extensions.Resilience" Version="10.4.0" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static async Task UseDatabaseAsync(this WebApplication app)
await EnsureSchemaAsync<ReviewsDbContext>(sp);
await EnsureSchemaAsync<FileStorageDbContext>(sp);
await EnsureSchemaAsync<BackgroundJobsDbContext>(sp);
await EnsureSchemaAsync<TickerQSchedulerDbContext>(sp);
await EnsureSchemaIfRegisteredAsync<TickerQSchedulerDbContext>(sp);

AuthBootstrapSeeder seeder = sp.GetRequiredService<AuthBootstrapSeeder>();
await seeder.SeedAsync();
Expand All @@ -33,7 +33,25 @@ private static async Task EnsureSchemaAsync<TContext>(IServiceProvider sp)
where TContext : DbContext
{
TContext context = sp.GetRequiredService<TContext>();
await EnsureSchemaCoreAsync(context);
}

/// <summary>
/// TickerQ (and its <see cref="TickerQSchedulerDbContext" />) is only registered when
/// BackgroundJobs:TickerQ:Enabled is true and Dragonfly is configured.
/// </summary>
private static async Task EnsureSchemaIfRegisteredAsync<TContext>(IServiceProvider sp)
where TContext : DbContext
{
TContext? context = sp.GetService<TContext>();
if (context is null)
return;

await EnsureSchemaCoreAsync(context);
}

private static async Task EnsureSchemaCoreAsync(DbContext context)
{
await context.Database.EnsureCreatedAsync();

IRelationalDatabaseCreator creator = context.GetService<IRelationalDatabaseCreator>();
Expand Down
3 changes: 2 additions & 1 deletion src/Modules/Identity/Persistence/AuthBootstrapSeeder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ private TenantIdentity GetTenantIdentity()

private Task<Tenant?> FindTenantAsync(string tenantCode, CancellationToken ct)
{
TenantCode code = TenantCode.FromPersistence(tenantCode);
return _dbContext
.Tenants.IgnoreQueryFilters([
GlobalQueryFilterNames.SoftDelete,
GlobalQueryFilterNames.Tenant,
])
.FirstOrDefaultAsync(t => t.Code.Value == tenantCode, ct);
.FirstOrDefaultAsync(t => t.Code == code, ct);
}

private bool CreateTenant(TenantIdentity tenantIdentity)
Expand Down
3 changes: 3 additions & 0 deletions src/Modules/Notifications/Notifications.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="APITemplate.Tests"/>
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Modules/Webhooks/Webhooks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="APITemplate.Tests"/>
</ItemGroup>
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App"/>
</ItemGroup>
Expand Down
Loading
Loading