Jobs/cv-search-job/Program.cs

@@ -3,6 +3,10 @@ using CvMatcher.Models.Settings;
 using CvSearch.Data;
 using CvSearchJob.Clients;
 using CvSearchJob.Services;
+using EmailApi.Data;
+using EmailApi.Data.Repositories;
+using EmailApi.Data.Repositories.Contracts;
+using EmailApi.Data.Services;
 using EmailApi.Models.Clients;
 using CvSearchJob.Tasks;
 using JobScheduler.Scheduling;
@@ -10,8 +14,6 @@ using JobScheduler.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using MyAi.Data;
-using MyAi.Data.Services;
 using Refit;
 using Serilog;
 using Common.Settings;
@@ -54,16 +56,18 @@ try
                 client.DefaultRequestHeaders.Add("X-Internal-Api-Key", key);
         });
 
-    builder.Services.AddDbContext<MyAiDbContext>(options =>
+    builder.Services.AddDbContext<EmailApiDbContext>(options =>
     {
         var connectionString = builder.Services.GetConfiguredDbConnectionString(builder.Configuration);
         options.UseSqlServer(connectionString, sql =>
         {
-            sql.MigrationsAssembly("myai-data");
-            sql.MigrationsHistoryTable(MyAiDbContext.MigrationTableName, MyAiDbContext.SchemaName);
+            sql.MigrationsHistoryTable(EmailApiDbContext.MigrationTableName, EmailApiDbContext.SchemaName);
+            sql.MigrationsAssembly("email-api-data");
         });
     });
-    builder.Services.AddSingleton<ITemplateService, DbTemplateService>();
+
+    builder.Services.AddScoped<IEmailTemplateRepository, EfEmailTemplateRepository>();
+    builder.Services.AddSingleton<IEmailTemplateService, EmailTemplateService>();
 
     builder.Services.AddRefitClient<IEmailApiClient>()
         .ConfigureHttpClient((sp, client) =>
@@ -98,11 +102,6 @@ try
         var db = scope.ServiceProvider.GetRequiredService<CvSearchDbContext>();
         db.Database.Migrate();
     }
-    using (var scope = host.Services.CreateScope())
-    {
-        var db = scope.ServiceProvider.GetRequiredService<MyAiDbContext>();
-        db.Database.Migrate();
-    }
 
     Log.Information("{Service} startup complete. Background scheduler is running.", ServiceName);
     await host.RunAsync();

Jobs/cv-search-job/Services/CvSearchEmailSender.cs

@@ -1,29 +1,25 @@
 using CvMatcher.Models.Responses;
 using CvSearch.Data.Entities;
+using EmailApi.Data.Services;
 using EmailApi.Models.Clients;
 using EmailApi.Models.Requests;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
-using MyAi.Data.Services;
 
 namespace CvSearchJob.Services;
 
 public sealed class CvSearchEmailSender
 {
     private readonly IEmailApiClient _emailApi;
-    private readonly ITemplateService _templates;
-    private readonly IConfiguration _config;
+    private readonly IEmailTemplateService _emailTemplates;
     private readonly ILogger<CvSearchEmailSender> _logger;
 
     public CvSearchEmailSender(
         IEmailApiClient emailApi,
-        ITemplateService templates,
-        IConfiguration config,
+        IEmailTemplateService emailTemplates,
         ILogger<CvSearchEmailSender> logger)
     {
         _emailApi = emailApi;
-        _templates = templates;
-        _config = config;
+        _emailTemplates = emailTemplates;
         _logger = logger;
     }
 
@@ -34,18 +30,18 @@ public sealed class CvSearchEmailSender
         string language,
         CancellationToken ct)
     {
-        var contactToEmail = _config["Contact:ToEmail"];
+        var operatorCopy = _emailTemplates.GetOperatorCopy("email.search-results.subject", language);
 
         var recipients = new List<string>();
         if (!string.IsNullOrWhiteSpace(toEmail)) recipients.Add(toEmail);
-        if (!string.IsNullOrWhiteSpace(contactToEmail) &&
-            !recipients.Any(r => string.Equals(r, contactToEmail, StringComparison.OrdinalIgnoreCase)))
-            recipients.Add(contactToEmail);
+        if (!string.IsNullOrWhiteSpace(operatorCopy) &&
+            !recipients.Any(r => string.Equals(r, operatorCopy, StringComparison.OrdinalIgnoreCase)))
+            recipients.Add(operatorCopy);
 
         if (recipients.Count == 0) return;
 
         var htmlBody = BuildBody(results, language);
-        var subject = _templates.Render("email.search-results.subject", language,
+        var subject = _emailTemplates.Render("email.search-results.subject", language,
             ("count", results.Count.ToString()));
 
         try
@@ -71,7 +67,7 @@ public sealed class CvSearchEmailSender
     private string BuildBody(IReadOnlyList<JobSearchResultEntity> results, string language)
     {
         if (results.Count == 0)
-            return _templates.Get("email.search-results.empty", language);
+            return _emailTemplates.Get("email.search-results.empty", language);
 
         var items = new System.Text.StringBuilder();
         for (int i = 0; i < results.Count; i++)
@@ -91,7 +87,7 @@ public sealed class CvSearchEmailSender
                 """);
         }
 
-        return _templates.Render("email.search-results.body", language,
+        return _emailTemplates.Render("email.search-results.body", language,
             ("count", results.Count.ToString()),
             ("items", items.ToString()));
     }

Jobs/cv-search-job/cv-search-job.csproj

@@ -21,12 +21,12 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Apis\cv-matcher-api-models\cv-matcher-api-models.csproj" />
+    <ProjectReference Include="..\..\Apis\email-api-data\email-api-data.csproj" />
     <ProjectReference Include="..\..\Apis\email-api-models\email-api-models.csproj" />
     <ProjectReference Include="..\..\Apis\cv-search-data\cv-search-data.csproj" />
     <ProjectReference Include="..\..\Apis\common\common.csproj" />
     <ProjectReference Include="..\..\Helpers\startup-helpers\startup-helpers.csproj" />
     <ProjectReference Include="..\job-scheduler\job-scheduler.csproj" />
-    <ProjectReference Include="..\..\Apis\myai-data\myai-data.csproj" />
   </ItemGroup>
 
 </Project>

docker-compose/docker-compose.yml

@@ -108,6 +108,13 @@ services:
       - ASPNETCORE_URLS=${ASPNETCORE_URLS:-http://+:8080}
       - APP_ENVIRONMENT_NAME=${APP_ENVIRONMENT_NAME:-myai.staging}
 
+      - Database__Host=${Database__Host:-sqlserver}
+      - Database__Port=${Database__Port:-1433}
+      - Database__Name=${Database__Name:-MyAiDb}
+      - Database__User=${Database__User:-sa}
+      - Database__Password=${Database__Password:-}
+      - Database__TrustServerCertificate=${Database__TrustServerCertificate:-true}
+
       - InternalApi__ApiKey=${EmailApi__InternalApiKey:-}
       - InternalApi__RequireApiKey=true
 
@@ -261,8 +268,6 @@ services:
       - EmailApi__BaseUrl=${EmailApi__BaseUrl:-http://email-api:8080}
       - EmailApi__InternalApiKey=${EmailApi__InternalApiKey:-}
 
-      - Contact__ToEmail=${Contact__ToEmail:-}
-
       - FileStorage__Path=${FileStorage__Path:-Files}
 
       - JobSearch__Enabled=${JobSearch__Enabled:-true}