Merge pull request 'Fix language consistency in job search and match emails' (#52) from feature/language-consistency into main

Merge PR #52: Fix language consistency in job search and match emails

Apis/api/Controllers/CvMatcherController.cs

@@ -172,7 +172,7 @@ public sealed class CvMatcherController : ControllerBase
             var attachmentPath = TryGetCachedCvPath(request.CvDocumentId);
             var jobLabel = !string.IsNullOrWhiteSpace(request.JobUrl)
                 ? request.JobUrl
-                : "Manual job description";
+                : _emailSender.GetManualJobLabel(language);
 
             var language = NormalizeLanguage(request.Language);
 

Apis/api/Services/Contracts/IEmailSender.cs

@@ -61,5 +61,11 @@ namespace Api.Services.Contracts
         /// <param name="expiryDays">Number of days until the job-search link expires (shown in the footer copy).</param>
         /// <returns>Rendered HTML body string.</returns>
         string BuildMatchEmailBody(string cvDocumentId, JobMatchResponse result, string? jobLabel, string language, string? jobSearchLink = null, int expiryDays = 7);
+
+        /// <summary>
+        /// Returns the localised label for a manually-entered job description (no URL provided).
+        /// </summary>
+        /// <param name="language">Two-letter language code.</param>
+        string GetManualJobLabel(string language);
     }
 }

Apis/api/Services/EmailApiEmailSender.cs

@@ -239,4 +239,7 @@ public sealed class EmailApiEmailSender : IEmailSender
         _emailTemplates.Render("email.match.subject", language,
             ("score", score.ToString()),
             ("jobLabel", jobLabel ?? "Job"));
+
+    public string GetManualJobLabel(string language) =>
+        _emailTemplates.Get("email.match.manual-job-label", language);
 }

Apis/email-api/Services/SmtpEmailDispatcher.cs

@@ -58,7 +58,7 @@ public sealed class SmtpEmailDispatcher
         if (!string.IsNullOrWhiteSpace(req.ReplyTo))
             msg.ReplyTo.Add(MailboxAddress.Parse(req.ReplyTo));
 
-        msg.Subject = $"[{_environmentName}] {req.Subject}".Trim();
+        msg.Subject = req.Subject.Trim();
 
         var shellStart = _templates.Get("email.html-shell.start", "*");
         var shellEnd = _templates.Get("email.html-shell.end", "*");

Apis/email-data/Migrations/20260608190611_AddManualJobLabelTemplate.Designer.cs

@@ -0,0 +1,69 @@
+// <auto-generated />
+using System;
+using Email.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Email.Data.Migrations
+{
+    [DbContext(typeof(EmailDbContext))]
+    [Migration("20260608190611_AddManualJobLabelTemplate")]
+    partial class AddManualJobLabelTemplate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("email")
+                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("Email.Data.Entities.EmailTemplateEntity", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Language")
+                        .HasMaxLength(8)
+                        .HasColumnType("nvarchar(8)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(500)
+                        .HasColumnType("nvarchar(500)")
+                        .HasDefaultValue("");
+
+                    b.Property<string>("OperatorCopy")
+                        .IsRequired()
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)")
+                        .HasDefaultValue("");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("datetime2")
+                        .HasDefaultValueSql("SYSUTCDATETIME()");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Key", "Language");
+
+                    b.ToTable("Templates", "email");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Apis/email-data/Migrations/20260608190611_AddManualJobLabelTemplate.cs

@@ -0,0 +1,43 @@
+using Email.Data;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Email.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddManualJobLabelTemplate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.InsertData(
+                schema: MigrationConstants.SchemaName,
+                table: "Templates",
+                columns: ["Key", "Language", "Value", "Description"],
+                values: ["email.match.manual-job-label", "en", "Manual job description", "Label used in the match email subject and body when no job URL was provided"]);
+
+            migrationBuilder.InsertData(
+                schema: MigrationConstants.SchemaName,
+                table: "Templates",
+                columns: ["Key", "Language", "Value", "Description"],
+                values: ["email.match.manual-job-label", "ro", "Descriere manuală a jobului", "Etichetă folosită în subiectul și corpul emailului când nu a fost furnizat un URL de job"]);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                schema: MigrationConstants.SchemaName,
+                table: "Templates",
+                keyColumns: ["Key", "Language"],
+                keyValues: ["email.match.manual-job-label", "en"]);
+
+            migrationBuilder.DeleteData(
+                schema: MigrationConstants.SchemaName,
+                table: "Templates",
+                keyColumns: ["Key", "Language"],
+                keyValues: ["email.match.manual-job-label", "ro"]);
+        }
+    }
+}

Apis/page-fetcher-api-models/FetchPageRequest.cs

@@ -17,4 +17,10 @@ public sealed class FetchPageRequest
     /// Identifies the calling service for audit purposes (e.g. <c>cv-matcher-api</c>, <c>cv-search-job</c>).
     /// </summary>
     public string CallerService { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Optional reference to the job search session that triggered this fetch.
+    /// Stored on <c>pageFetcher.PageFetches</c> for cross-schema audit queries.
+    /// </summary>
+    public string? JobSearchSessionId { get; set; }
 }

Apis/page-fetcher-api/Services/PageFetcherService.cs

@@ -101,6 +101,7 @@ public sealed class PageFetcherService
             Id = Guid.NewGuid().ToString("N"),
             Url = request.Url,
             CallerService = request.CallerService ?? string.Empty,
+            JobSearchSessionId = request.JobSearchSessionId,
             HttpStatusCode = statusCode,
             Html = html,
             Text = text,

Apis/page-fetcher-data/Data/Entities/PageFetchEntity.cs

@@ -31,4 +31,10 @@ public sealed class PageFetchEntity : BaseEntity
 
     /// <summary>Exception message when <see cref="Success"/> is <c>false</c>.</summary>
     public string? ErrorMessage { get; set; }
+
+    /// <summary>
+    /// Optional reference to the <c>cvSearch.JobSearchSessions</c> row that triggered this fetch.
+    /// Null for fetches not originating from a job search session (e.g. direct CV-to-job matches).
+    /// </summary>
+    public string? JobSearchSessionId { get; set; }
 }

Apis/page-fetcher-data/Migrations/20260608165542_AddJobSearchSessionId.Designer.cs

@@ -0,0 +1,88 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using PageFetcher.Data;
+
+#nullable disable
+
+namespace PageFetcher.Data.Migrations
+{
+    [DbContext(typeof(PageFetchDbContext))]
+    [Migration("20260608165542_AddJobSearchSessionId")]
+    partial class AddJobSearchSessionId
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasDefaultSchema("pageFetcher")
+                .HasAnnotation("ProductVersion", "10.0.7")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("PageFetcher.Data.Entities.PageFetchEntity", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("CallerService")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("datetime2")
+                        .HasDefaultValueSql("SYSUTCDATETIME()");
+
+                    b.Property<long>("DurationMs")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("ErrorMessage")
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)");
+
+                    b.Property<string>("Html")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("HttpStatusCode")
+                        .HasColumnType("int");
+
+                    b.Property<string>("JobSearchSessionId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<bool>("Success")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Text")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Url")
+                        .IsRequired()
+                        .HasMaxLength(2000)
+                        .HasColumnType("nvarchar(2000)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedAt");
+
+                    b.HasIndex("JobSearchSessionId");
+
+                    b.HasIndex("Url");
+
+                    b.ToTable("PageFetches", "pageFetcher");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Apis/page-fetcher-data/Migrations/20260608165542_AddJobSearchSessionId.cs

@@ -0,0 +1,43 @@
+using PageFetcher.Data;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PageFetcher.Data.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddJobSearchSessionId : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "JobSearchSessionId",
+                schema: MigrationConstants.SchemaName,
+                table: "PageFetches",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PageFetches_JobSearchSessionId",
+                schema: MigrationConstants.SchemaName,
+                table: "PageFetches",
+                column: "JobSearchSessionId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_PageFetches_JobSearchSessionId",
+                schema: MigrationConstants.SchemaName,
+                table: "PageFetches");
+
+            migrationBuilder.DropColumn(
+                name: "JobSearchSessionId",
+                schema: MigrationConstants.SchemaName,
+                table: "PageFetches");
+        }
+    }
+}

Apis/page-fetcher-data/Migrations/PageFetchDbContextModelSnapshot.cs

@@ -53,6 +53,10 @@ namespace PageFetcher.Data.Migrations
                     b.Property<int?>("HttpStatusCode")
                         .HasColumnType("int");
 
+                    b.Property<string>("JobSearchSessionId")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<bool>("Success")
                         .HasColumnType("bit");
 
@@ -69,6 +73,8 @@ namespace PageFetcher.Data.Migrations
 
                     b.HasIndex("CreatedAt");
 
+                    b.HasIndex("JobSearchSessionId");
+
                     b.HasIndex("Url");
 
                     b.ToTable("PageFetches", "pageFetcher");

Apis/page-fetcher-data/PageFetchDbContext.cs

@@ -36,8 +36,11 @@ public sealed class PageFetchDbContext : DbContext
             entity.Property(x => x.Html).IsRequired();
             entity.Property(x => x.Text).IsRequired();
             entity.Property(x => x.ErrorMessage).HasMaxLength(2000);
+            entity.Property(x => x.JobSearchSessionId).HasMaxLength(64);
             entity.Property(x => x.CreatedAt).HasDefaultValueSql("SYSUTCDATETIME()");
 
+            entity.HasIndex(x => x.JobSearchSessionId);
+
             entity.HasIndex(x => x.Url);
             entity.HasIndex(x => x.CreatedAt);
         });

Jobs/cv-search-job/Tasks/CvSearchJobTask.cs

@@ -169,7 +169,8 @@ public sealed class CvSearchJobTask : IJobTask
                 {
                     Url = url,
                     WaitFor = "domcontentloaded",
-                    CallerService = "cv-search-job"
+                    CallerService = "cv-search-job",
+                    JobSearchSessionId = session.Id
                 }, ct);
 
                 if (!fetchResponse.Success || string.IsNullOrWhiteSpace(fetchResponse.Text))
@@ -197,7 +198,9 @@ public sealed class CvSearchJobTask : IJobTask
                     // Pre-fetched text passed directly so cv-matcher-api skips re-fetching the page
                     JobDescription = jobText,
                     // User already gave GDPR consent when they clicked the one-time job search link
-                    GdprConsent = true
+                    GdprConsent = true,
+                    // Propagate language so the LLM uses the correct language-specific prompt
+                    Language = session.Language
                 };
 
                 var matchResult = await _matcherApi.MatchJobAsync(matchRequest, ct);