ld/OptixServe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BRAKING refactor project structure.

Browse Source 
Refactor: the project is now divided into a more clear structure, with **Infrastructure** and **Application** layers added.

Refactor: configurations are split into sections for different layers.

Fix: now EF Core related operations, such as migration, should be invoked in `OptixServe.Infrastructure`, with config file and data dir passed into `dotnet ef` command. See `OptixServe.Infrastructure/Utilites/DesignTimeDbContextFactory.cs` for details.

Fix: EF migrations are ignored in gitignore on purpose in early development.
This commit is contained in:
Sunday
2025-07-11 14:48:50 +08:00
parent 47cbdc21c1
commit 8b18de1735
20 changed files with 286 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OptixServe.Api/Program.cs
View File

@ -5,9 +5,10 @@ using Microsoft.IdentityModel.Tokens;
using OptixServe.Api.Configuration;
using OptixServe.Api.Endpoints;
using OptixServe.Api.Services;
using OptixServe.Core.Data;
using OptixServe.Core.Services;
using OptixServe.Api.Utilites;
using OptixServe.Application.Services;
using OptixServe.Infrastructure.Configuration;
using OptixServe.Infrastructure.Data;
using OptixServe.Infrastructure.Utilites;
class Program
{
@ -89,12 +90,7 @@ static class StartupHelper
public static void AddConfigurationWithCommand(this WebApplicationBuilder builder, FileInfo? file)
{
// Configure configuration sources in specified order
var configurationBuilder = new ConfigurationBuilder()
.SetBasePath(Directory.GetCurrentDirectory())
.AddJsonFile("appsettings.json", optional: true)
.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true)
.AddJsonFile("config.json", optional: true)
.AddJsonFile($"config.{builder.Environment.EnvironmentName}.json", optional: true);
var configurationBuilder = ConfigurationHelper.CreateDefaultBuilder();
// Add command-line specified config file if provided
if (file != null)
@ -123,13 +119,17 @@ static class StartupHelper
/// <param name="builder">WebApplicationBuilder instance</param>
public static void RegisterServices(this WebApplicationBuilder builder)
{
// Add configuration class
var optixSettigns = builder.Configuration.GetSection("OptixServe");
var onConfigSettings = optixSettigns.Get<OptixServeSettings>();
builder.Services.Configure<OptixServeSettings>(optixSettigns);
// Add configuration classes
var apiConfigSection = builder.Configuration.GetSection("OptixServe:Api");
builder.Services.Configure<ApiConfiguration>(apiConfigSection);
var apiConfig = apiConfigSection.Get<ApiConfiguration>();
var infraConfigSection = builder.Configuration.GetSection("OptixServe:Infrastructure");
builder.Services.Configure<InfrastructureConfiguration>(infraConfigSection);
var infraConfig = infraConfigSection.Get<InfrastructureConfiguration>();
// Add DBContext class
builder.Services.AddAppDatabase(onConfigSettings?.Database!);
builder.Services.AddAppDatabase(infraConfig?.Database!);
builder.Services.AddScoped<DbInitializer>();
// Application services
@ -140,7 +140,7 @@ static class StartupHelper
builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
.AddJwtBearer(options =>
{
var jwtSettings = onConfigSettings?.Jwt ?? throw new ArgumentNullException(nameof(builder), "JWT settings are not configured.");
var jwtSettings = apiConfig?.Jwt ?? throw new ArgumentNullException(nameof(builder), "JWT settings are not configured.");
options.TokenValidationParameters = new TokenValidationParameters
{
ValidateIssuer = true,
@ -178,4 +178,4 @@ static class StartupHelper
VersionEndpoint.Register(rootGroup);
}
}
}