Skip to content

[codex] Order Quartz lifecycle initializers #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfmskywalker merged 3 commits into from
May 12, 2026
Merged

[codex] Order Quartz lifecycle initializers #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cd9ed3
Order Quartz lifecycle initializers
sfmskywalker May 12, 2026
ab47131
Use stable CShells 0.0.21
sfmskywalker May 12, 2026
40cee1f
Cover Quartz store initializer ordering
sfmskywalker May 12, 2026
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
16 changes: 8 additions & 8 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,13 @@
<PackageVersion Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.12.0"/>
<PackageVersion Include="coverlet.collector" Version="6.0.4"/>
<PackageVersion Include="Cronos" Version="0.11.1"/>
<PackageVersion Include="CShells" Version="0.0.18"/>
<PackageVersion Include="CShells.Abstractions" Version="0.0.18"/>
<PackageVersion Include="CShells.AspNetCore" Version="0.0.18"/>
<PackageVersion Include="CShells.AspNetCore.Abstractions" Version="0.0.18"/>
<PackageVersion Include="CShells.FastEndpoints" Version="0.0.18"/>
<PackageVersion Include="CShells.FastEndpoints.Abstractions" Version="0.0.18"/>
<PackageVersion Include="CShells.Providers.FluentStorage" Version="0.0.18"/>
<PackageVersion Include="CShells" Version="0.0.21"/>
<PackageVersion Include="CShells.Abstractions" Version="0.0.21"/>
<PackageVersion Include="CShells.AspNetCore" Version="0.0.21"/>
<PackageVersion Include="CShells.AspNetCore.Abstractions" Version="0.0.21"/>
<PackageVersion Include="CShells.FastEndpoints" Version="0.0.21"/>
<PackageVersion Include="CShells.FastEndpoints.Abstractions" Version="0.0.21"/>
<PackageVersion Include="CShells.Providers.FluentStorage" Version="0.0.21"/>
<PackageVersion Include="CsvHelper" Version="33.1.0"/>
<PackageVersion Include="Dapper" Version="2.1.66"/>
<PackageVersion Include="DistributedLock" Version="2.7.1"/>
Expand Down Expand Up @@ -243,4 +243,4 @@
<PackageVersion Include="xunit.extensibility.core" Version="2.9.3"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5"/>
</ItemGroup>
</Project>
</Project>
3 changes: 1 addition & 2 deletions ...odules/scheduling/Elsa.Scheduling.Quartz.EFCore.MySql/ShellFeatures/QuartzMySqlFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public void ConfigureServices(IServiceCollection services)
else
services.AddDbContextFactory<MySqlQuartzDbContext>(Configure);

services.AddTransient<IShellInitializer>(sp =>
new EfCoreMigrationHandler(sp.GetRequiredService<IDbContextFactory<MySqlQuartzDbContext>>()));
services.AddShellInitializer<EfCoreMigrationHandler>(LifecyclePhase.Prepare, order: 100);

services.AddQuartz(quartz =>
{
Expand Down
3 changes: 1 addition & 2 deletions ...eduling/Elsa.Scheduling.Quartz.EFCore.PostgreSql/ShellFeatures/QuartzPostgreSqlFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public void ConfigureServices(IServiceCollection services)
else
services.AddDbContextFactory<PostgreSqlQuartzDbContext>(Configure);

services.AddTransient<IShellInitializer>(sp =>
new EfCoreMigrationHandler(sp.GetRequiredService<IDbContextFactory<PostgreSqlQuartzDbContext>>()));
services.AddShellInitializer<EfCoreMigrationHandler>(LifecyclePhase.Prepare, order: 100);

services.AddQuartz(quartz =>
{
Expand Down
3 changes: 1 addition & 2 deletions ...cheduling/Elsa.Scheduling.Quartz.EFCore.SqlServer/ShellFeatures/QuartzSqlServerFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public void ConfigureServices(IServiceCollection services)
else
services.AddDbContextFactory<SqlServerQuartzDbContext>(Configure);

services.AddTransient<IShellInitializer>(sp =>
new EfCoreMigrationHandler(sp.GetRequiredService<IDbContextFactory<SqlServerQuartzDbContext>>()));
services.AddShellInitializer<EfCoreMigrationHandler>(LifecyclePhase.Prepare, order: 100);

// AddQuartz is additive — layers the persistent store onto the base
// AddQuartz call already made by QuartzFeature (which ran first via DependsOn).
Expand Down
4 changes: 1 addition & 3 deletions ...ules/scheduling/Elsa.Scheduling.Quartz.EFCore.Sqlite/ShellFeatures/QuartzSqliteFeature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ public void ConfigureServices(IServiceCollection services)
else
services.AddDbContextFactory<SqliteQuartzDbContext>(Configure);

services.AddTransient<IShellInitializer>(sp =>
new EfCoreMigrationHandler(
sp.GetRequiredService<IDbContextFactory<SqliteQuartzDbContext>>()));
services.AddShellInitializer<EfCoreMigrationHandler>(LifecyclePhase.Prepare, order: 100);
}

public void PostConfigureServices(IServiceCollection services)
Expand Down
1 change: 1 addition & 0 deletions src/modules/scheduling/Elsa.Scheduling.Quartz/ShellFeatures/QuartzShellLifecycleHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace Elsa.Scheduling.Quartz.ShellFeatures;
/// so the <c>AwaitApplicationStarted</c> deferral logic from <c>QuartzHostedService</c>
/// is intentionally omitted — it is irrelevant in this context.
/// </remarks>
[LifecycleOrder(LifecyclePhase.Start, 100)]
public class QuartzShellLifecycleHandler(
IQuartzSchedulerFactory schedulerFactory,
IHostApplicationLifetime appLifetime,
Expand Down
4 changes: 4 additions & 0 deletions ...dules/scheduling/Elsa.Scheduling.Quartz.UnitTests/Elsa.Scheduling.Quartz.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\modules\scheduling\Elsa.Scheduling.Quartz\Elsa.Scheduling.Quartz.csproj" />
<ProjectReference Include="..\..\..\..\src\modules\scheduling\Elsa.Scheduling.Quartz.EFCore.MySql\Elsa.Scheduling.Quartz.EFCore.MySql.csproj" />
<ProjectReference Include="..\..\..\..\src\modules\scheduling\Elsa.Scheduling.Quartz.EFCore.PostgreSql\Elsa.Scheduling.Quartz.EFCore.PostgreSql.csproj" />
<ProjectReference Include="..\..\..\..\src\modules\scheduling\Elsa.Scheduling.Quartz.EFCore.SqlServer\Elsa.Scheduling.Quartz.EFCore.SqlServer.csproj" />
<ProjectReference Include="..\..\..\..\src\modules\scheduling\Elsa.Scheduling.Quartz.EFCore.Sqlite\Elsa.Scheduling.Quartz.EFCore.Sqlite.csproj" />
</ItemGroup>

</Project>
41 changes: 41 additions & 0 deletions test/modules/scheduling/Elsa.Scheduling.Quartz.UnitTests/ShellFeatures/QuartzFeatureTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
using CShells.Features;
using CShells.Lifecycle;
using Elsa.Scheduling.Quartz.EFCore.MySql.ShellFeatures;
using Elsa.Scheduling.Quartz.EFCore.PostgreSql.ShellFeatures;
using Elsa.Scheduling.Quartz.EFCore.SqlServer.ShellFeatures;
using Elsa.Scheduling.Quartz.EFCore.Sqlite.ShellFeatures;
using Elsa.Scheduling.Quartz.ShellFeatures;
using Microsoft.Extensions.DependencyInjection;
using System.Reflection;

namespace Elsa.Scheduling.Quartz.UnitTests.ShellFeatures;

Expand All @@ -26,6 +31,42 @@ public void SchedulerInitializer_IsRegisteredDuringPostConfigure()
Assert.NotNull(initializerRegistrations[1].ImplementationFactory);
}

[Fact]
public void SchedulerInitializer_RunsInStartPhase()
{
var order = typeof(QuartzShellLifecycleHandler).GetCustomAttribute<LifecycleOrderAttribute>();

Assert.NotNull(order);
Assert.Equal(LifecyclePhase.Start, order.Phase);
Assert.Equal(100, order.Order);
}
Comment thread
sfmskywalker marked this conversation as resolved.

[Theory]
[MemberData(nameof(QuartzStoreFeatures))]
public void StoreMigrationInitializer_RunsInPreparePhase(IShellFeature feature)
{
var services = new ServiceCollection();

feature.ConfigureServices(services);

var initializer = Assert.Single(services, x => x.ServiceType == typeof(IShellInitializer));
var registrationDescriptor = Assert.Single(services, x => x.ServiceType == typeof(ShellInitializerRegistration));
var registration = Assert.IsType<ShellInitializerRegistration>(registrationDescriptor.ImplementationInstance);

Assert.NotNull(initializer.ImplementationFactory);
Assert.Equal(LifecyclePhase.Prepare, registration.Phase);
Assert.Equal(100, registration.Order);
Assert.True(typeof(IShellInitializer).IsAssignableFrom(registration.InitializerType));
}

public static TheoryData<IShellFeature> QuartzStoreFeatures() => new()
{
new QuartzMySqlFeature(),
new QuartzPostgreSqlFeature(),
new QuartzSqlServerFeature(),
new QuartzSqliteFeature()
};

private sealed class DependentInitializer : IShellInitializer
{
public Task InitializeAsync(CancellationToken cancellationToken = default) => Task.CompletedTask;
Expand Down
Loading