diff --git a/Apis/api/Program.cs b/Apis/api/Program.cs index 1b45e17..76f6c5c 100644 --- a/Apis/api/Program.cs +++ b/Apis/api/Program.cs @@ -51,12 +51,12 @@ try }); builder.Services.AddSingleton(); - builder.Services.AddDbContext(options => + builder.Services.AddDbContext(options => { var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration); options.UseSqlServer(connectionString, sql => { - sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName); + sql.MigrationsHistoryTable(EmailDbContext.MigrationTableName, EmailDbContext.SchemaName); sql.MigrationsAssembly("email-data"); }); }); diff --git a/Apis/email-api/Program.cs b/Apis/email-api/Program.cs index ac071a5..2d7cee0 100644 --- a/Apis/email-api/Program.cs +++ b/Apis/email-api/Program.cs @@ -29,12 +29,12 @@ try builder.Services.Configure(builder.Configuration.GetSection("Smtp")); builder.Services.Configure(builder.Configuration.GetSection("FileStorage")); - builder.Services.AddDbContext(options => + builder.Services.AddDbContext(options => { var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration); options.UseSqlServer(connectionString, sql => { - sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName); + sql.MigrationsHistoryTable(EmailDbContext.MigrationTableName, EmailDbContext.SchemaName); sql.MigrationsAssembly("email-data"); }); }); @@ -61,7 +61,7 @@ try Log.Information("Running EF Core migrations if any"); using (var scope = app.Services.CreateScope()) { - var db = scope.ServiceProvider.GetRequiredService(); + var db = scope.ServiceProvider.GetRequiredService(); db.Database.Migrate(); } diff --git a/Apis/email-data/EmailApiDbContext.cs b/Apis/email-data/EmailDbContext.cs similarity index 82% rename from Apis/email-data/EmailApiDbContext.cs rename to Apis/email-data/EmailDbContext.cs index 61cb29d..01bf02b 100644 --- a/Apis/email-data/EmailApiDbContext.cs +++ b/Apis/email-data/EmailDbContext.cs @@ -3,14 +3,14 @@ using Microsoft.EntityFrameworkCore; namespace Email.Data; -public sealed class EmailApiDbContext : DbContext +public sealed class EmailDbContext : DbContext { public const string SchemaName = MigrationConstants.SchemaName; public const string MigrationTableName = MigrationConstants.MigrationTableName; - public EmailApiDbContext(DbContextOptions options) : base(options) { } + public EmailDbContext(DbContextOptions options) : base(options) { } - public DbSet EmailTemplates => Set(); + public DbSet Templates => Set(); protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) { @@ -25,7 +25,7 @@ public sealed class EmailApiDbContext : DbContext modelBuilder.Entity(entity => { - entity.ToTable("EmailTemplates"); + entity.ToTable("Templates"); entity.HasKey(x => new { x.Key, x.Language }); entity.Property(x => x.Key).HasMaxLength(128); entity.Property(x => x.Language).HasMaxLength(8); diff --git a/Apis/email-data/MigrationConstants.cs b/Apis/email-data/MigrationConstants.cs index fffec51..9cc17f7 100644 --- a/Apis/email-data/MigrationConstants.cs +++ b/Apis/email-data/MigrationConstants.cs @@ -1,7 +1,7 @@ namespace Email.Data; /// -/// Schema constants used by EmailApiDbContext and migrations. +/// Schema constants used by EmailDbContext and migrations. /// Centralized to avoid hardcoded strings and ensure consistency. /// public static class MigrationConstants diff --git a/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs index a0b02bb..b8667e8 100644 --- a/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs +++ b/Apis/email-data/Migrations/20260528100000_CreateEmailTemplates.Designer.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Email.Data.Migrations { - [DbContext(typeof(EmailApiDbContext))] + [DbContext(typeof(EmailDbContext))] [Migration("20260528100000_CreateEmailTemplates")] partial class CreateEmailTemplates { diff --git a/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs index a2cc8a4..b93ffff 100644 --- a/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs +++ b/Apis/email-data/Migrations/20260528130652_SeedEmailTemplates.Designer.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Email.Data.Migrations { - [DbContext(typeof(EmailApiDbContext))] + [DbContext(typeof(EmailDbContext))] [Migration("20260528130652_SeedEmailTemplates")] partial class SeedEmailTemplates { diff --git a/Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs b/Apis/email-data/Migrations/EmailDbContextModelSnapshot.cs similarity index 92% rename from Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs rename to Apis/email-data/Migrations/EmailDbContextModelSnapshot.cs index 125d1bc..db53a2d 100644 --- a/Apis/email-data/Migrations/EmailApiDbContextModelSnapshot.cs +++ b/Apis/email-data/Migrations/EmailDbContextModelSnapshot.cs @@ -10,8 +10,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Email.Data.Migrations { - [DbContext(typeof(EmailApiDbContext))] - partial class EmailApiDbContextModelSnapshot : ModelSnapshot + [DbContext(typeof(EmailDbContext))] + partial class EmailDbContextModelSnapshot : ModelSnapshot { protected override void BuildModel(ModelBuilder modelBuilder) { @@ -58,7 +58,7 @@ namespace Email.Data.Migrations b.HasKey("Key", "Language"); - b.ToTable("EmailTemplates", MigrationConstants.SchemaName); + b.ToTable("Templates", MigrationConstants.SchemaName); }); #pragma warning restore 612, 618 } diff --git a/Apis/email-data/Repositories/EfEmailTemplateRepository.cs b/Apis/email-data/Repositories/EfEmailTemplateRepository.cs index 826041b..406fd0c 100644 --- a/Apis/email-data/Repositories/EfEmailTemplateRepository.cs +++ b/Apis/email-data/Repositories/EfEmailTemplateRepository.cs @@ -6,13 +6,13 @@ namespace Email.Data.Repositories; public sealed class EfEmailTemplateRepository : IEmailTemplateRepository { - private readonly EmailApiDbContext _db; + private readonly EmailDbContext _db; - public EfEmailTemplateRepository(EmailApiDbContext db) + public EfEmailTemplateRepository(EmailDbContext db) { _db = db; } public async Task> GetAllAsync(CancellationToken ct) - => await _db.EmailTemplates.AsNoTracking().ToListAsync(ct); + => await _db.Templates.AsNoTracking().ToListAsync(ct); } diff --git a/Jobs/cv-search-job/Program.cs b/Jobs/cv-search-job/Program.cs index cd02110..2e593e6 100644 --- a/Jobs/cv-search-job/Program.cs +++ b/Jobs/cv-search-job/Program.cs @@ -56,13 +56,13 @@ try client.DefaultRequestHeaders.Add("X-Internal-Api-Key", key); }); - builder.Services.AddDbContext(options => + builder.Services.AddDbContext(options => { var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration); options.UseSqlServer(connectionString, sql => { - sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName); - sql.MigrationsAssembly("email-api-data"); + sql.MigrationsHistoryTable(EmailDbContext.MigrationTableName, EmailDbContext.SchemaName); + sql.MigrationsAssembly("email-data"); }); });