e95ed36647
Phases 1-10 of the planned refactoring:
Phase 1: rename shared-models -> common
- namespace Shared.Models -> Common throughout
- remove stale AspNetCore.Http.Features 5.0 reference
Phase 2: create shared-data with abstract BaseEntity
- BaseEntity: required string Id { get; init; } + DateTime CreatedAt { get; init; }
Phase 3: rename myai-models -> myai-data
- namespace MyAi.Models -> MyAi.Data
- MigrationsAssembly("myai-data")
Phase 4: rename cv-search-models -> cv-search-data
- namespace CvSearch.Models -> CvSearch.Data
- move JobSearchSettings to cv-matcher-api-models
- JobSearch*Entity now inherits BaseEntity
Phase 5: extract rag-data from rag-api
- new project: Apis/rag-data with RagDbContext + entities + migrations
- RagDocumentEntity inherits BaseEntity; cache entities use CacheKey PK
- fix duplicate AddHttpClient<RagAiClient>/AddScoped registrations in rag-api
- MigrationsAssembly("rag-data")
Phase 6: extract cv-matcher-data from cv-matcher-api
- new project: Apis/cv-matcher-data with CvMatcherDbContext + entities + migrations
- CvMatchResultEntity inherits BaseEntity; CvMatcherChatCacheEntity uses CacheKey PK
- MigrationsAssembly("cv-matcher-data")
Phase 7: create empty cv-cleanup-job-models and cv-search-job-models
Phase 8: update all 5 Dockerfiles for renamed/new projects
Phase 9: reorganise .sln virtual folders (Apis/Jobs/Models/Data/Helpers)
- update root CLAUDE.md with new project taxonomy and migration commands
- update cv-matcher-api/CLAUDE.md and cv-search-job/CLAUDE.md
Phase 10: add Directory.Packages.props for centralised NuGet versions
- remove Version= from all PackageReference elements in active .csproj files
No database changes. No runtime behaviour changes.
All MigrationId strings in __EFMigrationsHistory are unaffected.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
143 lines
5.2 KiB
C#
143 lines
5.2 KiB
C#
using Api.Clients.Ai;
|
|
using Api.Clients.Ai.Contracts;
|
|
using Api.Clients.Api;
|
|
using Api.Clients.Api.Contracts;
|
|
using CvMatcher.Data;
|
|
using CvMatcher.Data.Repositories;
|
|
using CvMatcher.Data.Repositories.Contracts;
|
|
using Api.Services;
|
|
using Api.Services.Contracts;
|
|
using CvMatcher.Models.Settings;
|
|
using CvSearch.Data;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using MyAi.Data;
|
|
using MyAi.Data.Services;
|
|
using Refit;
|
|
using Serilog;
|
|
using Common.Settings;
|
|
using StartupHelpers;
|
|
using System.Reflection;
|
|
|
|
StartupExtensions.LoadDotEnvFile();
|
|
|
|
const string ServiceName = "cv-matcher-api";
|
|
var appVersion = StartupExtensions.GetApplicationVersion(Assembly.GetExecutingAssembly());
|
|
|
|
try
|
|
{
|
|
var builder = WebApplication.CreateBuilder(args);
|
|
|
|
builder.ConfigureJsonSerilog(ServiceName, appVersion);
|
|
Log.Information("Starting {Service} version {AppVersion}", ServiceName, appVersion);
|
|
|
|
builder.AddAzureKeyVaultIfConfigured();
|
|
|
|
builder.Services.Configure<DatabaseSettings>(builder.Configuration.GetSection("Database"));
|
|
builder.Services.Configure<RagApiSettings>(builder.Configuration.GetSection("RagApi"));
|
|
builder.Services.Configure<InternalApiSettings>(builder.Configuration.GetSection("InternalApi"));
|
|
builder.Services.Configure<CvMatcher.Models.Settings.AiSettings>(builder.Configuration.GetSection("Ai"));
|
|
builder.Services.Configure<MatcherSettings>(builder.Configuration.GetSection("Matcher"));
|
|
builder.Services.Configure<JobSearchSettings>(builder.Configuration.GetSection("JobSearch"));
|
|
|
|
builder.Services.AddRefitClient<IRefitRagApi>()
|
|
.ConfigureHttpClient((sp, c) =>
|
|
{
|
|
var settings = sp.GetRequiredService<Microsoft.Extensions.Options.IOptions<RagApiSettings>>().Value;
|
|
c.BaseAddress = new Uri(settings.BaseUrl.TrimEnd('/') + "/");
|
|
if (!string.IsNullOrWhiteSpace(settings.InternalApiKey))
|
|
{
|
|
c.DefaultRequestHeaders.Add("X-Internal-Api-Key", settings.InternalApiKey);
|
|
}
|
|
});
|
|
|
|
builder.Services.AddScoped<IRagApiClient, RagApiClient>();
|
|
builder.Services.AddHttpClient<IMatcherAiClient, MatcherAiClient>();
|
|
builder.Services.AddHttpClient<IJobTextExtractor, JobTextExtractor>();
|
|
|
|
builder.Services.AddDbContext<CvMatcherDbContext>(options =>
|
|
{
|
|
var configuration = builder.Configuration;
|
|
var connectionString = builder.Services.GetConfiguredDbConnectionString(configuration);
|
|
|
|
options.UseSqlServer(connectionString, sql =>
|
|
{
|
|
sql.MigrationsHistoryTable(CvMatcherDbContext.MigrationTableName, CvMatcherDbContext.SchemaName);
|
|
sql.MigrationsAssembly("cv-matcher-data");
|
|
});
|
|
});
|
|
|
|
builder.Services.AddDbContext<CvSearchDbContext>(options =>
|
|
{
|
|
var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration);
|
|
options.UseSqlServer(connectionString, sql =>
|
|
{
|
|
sql.MigrationsAssembly("cv-search-data");
|
|
sql.MigrationsHistoryTable(CvSearchDbContext.MigrationTableName, CvSearchDbContext.SchemaName);
|
|
});
|
|
});
|
|
|
|
builder.Services.AddDbContext<MyAiDbContext>(options =>
|
|
{
|
|
var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration);
|
|
options.UseSqlServer(connectionString, sql =>
|
|
{
|
|
sql.MigrationsAssembly("myai-data");
|
|
sql.MigrationsHistoryTable(MyAiDbContext.MigrationTableName, MyAiDbContext.SchemaName);
|
|
});
|
|
});
|
|
builder.Services.AddSingleton<ITemplateService, DbTemplateService>();
|
|
|
|
builder.Services.AddScoped<IMatcherRepository, EfMatcherRepository>();
|
|
builder.Services.AddScoped<ICvMatcherService, CvMatcherService>();
|
|
builder.Services.AddScoped<IJobTokenService, JobTokenService>();
|
|
|
|
builder.Services.AddControllers();
|
|
builder.Services.AddSwaggerWithXmlComments(Assembly.GetExecutingAssembly(), ServiceName);
|
|
|
|
var app = builder.Build();
|
|
|
|
app.LogStartupDiagnostics(ServiceName);
|
|
|
|
using (var scope = app.Services.CreateScope())
|
|
{
|
|
var repository = scope.ServiceProvider.GetRequiredService<IMatcherRepository>();
|
|
await repository.InitializeAsync(CancellationToken.None);
|
|
}
|
|
|
|
app.UseDefaultSerilogRequestLogging();
|
|
app.UseJsonExceptionHandler(ServiceName);
|
|
app.UseInternalApiKeyProtection();
|
|
app.UseSwaggerInDevelopment(ServiceName, ServiceName);
|
|
|
|
app.MapControllers();
|
|
|
|
Log.Information("Running EF Core migrations if any");
|
|
using (var scope = app.Services.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<CvMatcherDbContext>();
|
|
db.Database.Migrate();
|
|
}
|
|
using (var scope = app.Services.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<CvSearchDbContext>();
|
|
db.Database.Migrate();
|
|
}
|
|
using (var scope = app.Services.CreateScope())
|
|
{
|
|
var db = scope.ServiceProvider.GetRequiredService<MyAiDbContext>();
|
|
db.Database.Migrate();
|
|
}
|
|
|
|
Log.Information("{Service} startup complete", ServiceName);
|
|
app.Run();
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
Log.Fatal(ex, "{Service} terminated unexpectedly", ServiceName);
|
|
}
|
|
finally
|
|
{
|
|
Log.Information("Shutting down {Service}", ServiceName);
|
|
Log.CloseAndFlush();
|
|
}
|