diff --git a/JobTrackerApi.Tests/ProfileCvControllerTests.cs b/JobTrackerApi.Tests/ProfileCvControllerTests.cs index 150c0d71..20fb3993 100644 --- a/JobTrackerApi.Tests/ProfileCvControllerTests.cs +++ b/JobTrackerApi.Tests/ProfileCvControllerTests.cs @@ -934,6 +934,32 @@ public sealed class ProfileCvControllerTests Assert.Contains("42", json, StringComparison.OrdinalIgnoreCase); } + [Theory] + [InlineData("Expérience", "Expe\u0301rience", "## Éducation")] + [InlineData("Γλώσσες", "Γλώσσες", "## Εκπαίδευση")] + [InlineData("Språk", "Languages", "## Utdanning")] + [InlineData("Portfolio – 2026", "Portfolio – 2026", "## Certificates")] + [InlineData("Expérience", "Expérience", "Projets supplémentaires")] + [InlineData("Språk", "Languages", "Utdanning:")] + public async Task Rewrite_preview_replaces_only_the_selected_document_section(string heading, string selected, string nextHeading) + { + var source = $"## {heading}\r\n\r\nTravail en équipe\r\nOriginal work.\r\n{nextHeading}\r\nKeep this content."; + var user = new ApplicationUser { Id = "user-1", ProfileCvText = source }; + var users = CreateUserManager(); + users.Setup(x => x.GetUserAsync(It.IsAny())).ReturnsAsync(user); + var ai = new Mock(); + ai.Setup(x => x.SummarizeSectionAsync(It.IsAny(), It.IsAny(), 900, 180)) + .ReturnsAsync("Updated work."); + await using var db = CreateDb(); + var controller = CreateController(users.Object, ai.Object, db, CreatePaths()); + var action = await controller.BuildRewritePreview(new ProfileCvController.RewriteSectionRequest { SectionName = selected }); + var preview = Assert.IsType(Assert.IsType(action.Result).Value); + + Assert.Equal($"## {heading}\nUpdated work.\n\n{nextHeading}\nKeep this content.", preview.FullText.ReplaceLineEndings("\n")); + ai.Verify(x => x.SummarizeSectionAsync(It.IsAny(), It.Is(text => text.Contains("Original work.") && !text.Contains("Keep this content.")), 900, 180), Times.Once); + Assert.Equal(source, user.ProfileCvText); + } + [Fact] public async Task Parse_returns_structured_cv_and_persists_it() { diff --git a/JobTrackerApi/Controllers/ProfileCvController.cs b/JobTrackerApi/Controllers/ProfileCvController.cs index 318dd4da..b992f1cc 100644 --- a/JobTrackerApi/Controllers/ProfileCvController.cs +++ b/JobTrackerApi/Controllers/ProfileCvController.cs @@ -581,6 +581,9 @@ public sealed partial class ProfileCvController : ControllerBase : string.Join("\n\n", structuredCv.Sections.Select(section => $"## {section.Name}\n{section.Content}")); } + if (sourceText is not null && FindRewriteSection(sourceText, sectionName) is { } range) + return sourceText[range.Start..range.End].Trim(); + var matchingSection = structuredCv.Sections.FirstOrDefault(section => string.Equals(section.Name, sectionName, StringComparison.OrdinalIgnoreCase)); if (matchingSection is not null && !string.IsNullOrWhiteSpace(matchingSection.Content)) { @@ -618,6 +621,33 @@ public sealed partial class ProfileCvController : ControllerBase return null; } + private static readonly Regex RewriteHeading = new( + @"^(?:(?#{1,2})[ \t]+(?[^\r\n]+?)|(?[\p{Lu}\p{Lt}][\p{L}\p{M} &/]+?))(?:)?[ \t]*\r?$", + RegexOptions.Multiline | RegexOptions.CultureInvariant); + + private static (int Start, int End, string Name)? FindRewriteSection(string text, string sectionName) + { + var target = NormalizeRewriteSectionName(sectionName.Normalize()); + foreach (Match heading in RewriteHeading.Matches(text)) + { + var name = heading.Groups["name"].Value.Trim(); + if (!string.Equals(NormalizeRewriteSectionName(name.Normalize()), target, StringComparison.OrdinalIgnoreCase)) + continue; + var next = heading.NextMatch(); + if (heading.Groups["marker"].Success && next.Success && + !next.Groups["marker"].Success && !next.Groups["colon"].Success && + !SectionAliases.ContainsKey(next.Groups["name"].Value.Trim())) + { + // The first unmarked line may be prose. Preserve later legacy headings even without a blank separator. + var bodyStart = heading.Index + heading.Length; + if (text.AsSpan(bodyStart, next.Index - bodyStart).Trim().IsEmpty) + next = next.NextMatch(); + } + return (heading.Index, next.Success ? next.Index : text.Length, name); + } + return null; + } + private static string ReplaceOrAppendCvSection(string source, string sectionName, string sectionDraft) { var trimmedSource = (source ?? string.Empty).Trim(); @@ -625,20 +655,14 @@ public sealed partial class ProfileCvController : ControllerBase if (string.IsNullOrWhiteSpace(trimmedDraft)) return trimmedSource; if (string.IsNullOrWhiteSpace(trimmedSource)) return $"## {sectionName}\n{trimmedDraft}"; - var normalizedHeading = sectionName.Trim().ToLowerInvariant(); - var headingPattern = new Regex(@"^(##\s+|#\s+)?(?[A-Z][A-Za-z &/]+):?\s*$", RegexOptions.Multiline); - var matches = headingPattern.Matches(trimmedSource).ToList(); - var targetIndex = matches.FindIndex(match => string.Equals(match.Groups["name"].Value.Trim(), normalizedHeading, StringComparison.OrdinalIgnoreCase)); - if (targetIndex < 0) + if (FindRewriteSection(trimmedSource, sectionName) is not { } range) { return $"{trimmedSource}\n\n## {sectionName}\n{trimmedDraft}".Trim(); } - var start = matches[targetIndex].Index; - var end = targetIndex + 1 < matches.Count ? matches[targetIndex + 1].Index : trimmedSource.Length; - var before = trimmedSource[..start].TrimEnd(); - var after = trimmedSource[end..].TrimStart(); - return string.Join("\n\n", new[] { before, $"## {sectionName}\n{trimmedDraft}", after }.Where(part => !string.IsNullOrWhiteSpace(part))).Trim(); + var before = trimmedSource[..range.Start].TrimEnd(); + var after = trimmedSource[range.End..].TrimStart(); + return string.Join("\n\n", new[] { before, $"## {range.Name}\n{trimmedDraft}", after }.Where(part => !string.IsNullOrWhiteSpace(part))).Trim(); } private static IReadOnlyList GetCvTemplateDescriptors()