feat(search): enrich searchDocuments with per-document match data

DocumentService.searchDocuments now returns DocumentSearchResult with matchData populated from findEnrichmentData. Title highlights are parsed from chr(1)/chr(2) delimiters into MatchOffset lists; transcription snippet and sender/receiver/tag match flags are extracted from the same native SQL row. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-15 17:53:57 +02:00
parent c235151075
commit f723a83011
5 changed files with 157 additions and 27 deletions
--- a/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/controller/DocumentControllerTest.java
@@ -1,6 +1,7 @@
 package org.raddatz.familienarchiv.controller;

 import org.junit.jupiter.api.Test;
+import org.raddatz.familienarchiv.dto.DocumentSearchResult;
 import org.raddatz.familienarchiv.dto.DocumentVersionSummary;
 import org.raddatz.familienarchiv.dto.IncompleteDocumentDTO;
 import org.raddatz.familienarchiv.model.Document;
@@ -61,7 +62,7 @@ class DocumentControllerTest {
    @WithMockUser
    void search_returns200_whenAuthenticated() throws Exception {
        when(documentService.searchDocuments(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()))
-                .thenReturn(Collections.emptyList());
+                .thenReturn(DocumentSearchResult.of(List.of()));

        mockMvc.perform(get("/api/documents/search"))
                .andExpect(status().isOk());
@@ -71,7 +72,7 @@ class DocumentControllerTest {
    @WithMockUser
    void search_withStatusParam_passesItToService() throws Exception {
        when(documentService.searchDocuments(any(), any(), any(), any(), any(), any(), any(), eq(DocumentStatus.REVIEWED), any(), any()))
-                .thenReturn(Collections.emptyList());
+                .thenReturn(DocumentSearchResult.of(List.of()));

        mockMvc.perform(get("/api/documents/search").param("status", "REVIEWED"))
                .andExpect(status().isOk());
@@ -104,7 +105,7 @@ class DocumentControllerTest {
    @WithMockUser
    void search_responseContainsTotalCount() throws Exception {
        when(documentService.searchDocuments(any(), any(), any(), any(), any(), any(), any(), any(), any(), any()))
-                .thenReturn(Collections.emptyList());
+                .thenReturn(DocumentSearchResult.of(List.of()));

        mockMvc.perform(get("/api/documents/search"))
                .andExpect(status().isOk())
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceSortTest.java
@@ -5,6 +5,7 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.raddatz.familienarchiv.dto.DocumentSearchResult;
 import org.raddatz.familienarchiv.dto.DocumentSort;
 import org.raddatz.familienarchiv.model.Document;
 import org.raddatz.familienarchiv.model.DocumentStatus;
@@ -51,12 +52,12 @@ class DocumentServiceSortTest {
        when(documentRepository.findAll(any(Specification.class), any(Sort.class)))
                .thenReturn(List.of(newer, older));

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                "Brief", null, null, null, null, null, null, null, DocumentSort.DATE, "DESC");

        // Expect: date order (newer 1960 first), NOT rank order (older 1940 first)
-        assertThat(result).hasSize(2);
-        assertThat(result.get(0).getId()).isEqualTo(id2);  // newer doc first
+        assertThat(result.documents()).hasSize(2);
+        assertThat(result.documents().get(0).getId()).isEqualTo(id2);  // newer doc first
    }

    // ─── searchDocuments — RELEVANCE sort ─────────────────────────────────────
@@ -73,11 +74,11 @@ class DocumentServiceSortTest {
        when(documentRepository.findAll(any(Specification.class)))
                .thenReturn(List.of(doc2, doc1));  // unordered from DB

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                "Brief", null, null, null, null, null, null, null, DocumentSort.RELEVANCE, null);

        // Expect: rank order restored (id1 first)
-        assertThat(result.get(0).getId()).isEqualTo(id1);
+        assertThat(result.documents().get(0).getId()).isEqualTo(id1);
    }

    @Test
@@ -92,9 +93,9 @@ class DocumentServiceSortTest {
        when(documentRepository.findAll(any(Specification.class)))
                .thenReturn(List.of(doc2, doc1));

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                "Brief", null, null, null, null, null, null, null, null, null);

-        assertThat(result.get(0).getId()).isEqualTo(id1);
+        assertThat(result.documents().get(0).getId()).isEqualTo(id1);
    }
 }
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/DocumentServiceTest.java
@@ -6,11 +6,14 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.raddatz.familienarchiv.dto.DocumentSearchResult;
+import org.raddatz.familienarchiv.dto.DocumentSort;
 import org.raddatz.familienarchiv.dto.DocumentUpdateDTO;
 import org.raddatz.familienarchiv.dto.IncompleteDocumentDTO;
+import org.raddatz.familienarchiv.dto.MatchOffset;
+import org.raddatz.familienarchiv.dto.SearchMatchData;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.model.Document;
-import org.raddatz.familienarchiv.dto.DocumentSort;
 import org.raddatz.familienarchiv.model.DocumentStatus;
 import org.raddatz.familienarchiv.model.Person;
 import org.raddatz.familienarchiv.model.Tag;
@@ -22,6 +25,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.mock.web.MockMultipartFile;

 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -1287,11 +1291,11 @@ class DocumentServiceTest {
        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class)))
                .thenReturn(List.of(withSender, noSender));

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                null, null, null, null, null, null, null, null, DocumentSort.SENDER, "asc");

-        assertThat(result).hasSize(2);
-        assertThat(result).extracting(Document::getTitle).containsExactly("Has Sender", "No Sender");
+        assertThat(result.documents()).hasSize(2);
+        assertThat(result.documents()).extracting(Document::getTitle).containsExactly("Has Sender", "No Sender");
    }

    // ─── searchDocuments — RECEIVER sort, empty receivers ───────────────────────
@@ -1307,10 +1311,10 @@ class DocumentServiceTest {
        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class)))
                .thenReturn(List.of(noReceivers, withReceiver));

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                null, null, null, null, null, null, null, null, DocumentSort.RECEIVER, "asc");

-        assertThat(result).extracting(Document::getTitle)
+        assertThat(result.documents()).extracting(Document::getTitle)
                .containsExactly("Has Receiver", "No Receivers");
    }

@@ -1329,11 +1333,63 @@ class DocumentServiceTest {
        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class)))
                .thenReturn(List.of(docNullName, docSmith));

-        List<Document> result = documentService.searchDocuments(
+        DocumentSearchResult result = documentService.searchDocuments(
                null, null, null, null, null, null, null, null, DocumentSort.SENDER, "asc");

        // null lastName should sort to end (treated as empty), not before "smith" (as "null")
-        assertThat(result).extracting(Document::getTitle)
+        assertThat(result.documents()).extracting(Document::getTitle)
                .containsExactly("smith doc", "Null lastname doc");
    }
+
+    // ─── searchDocuments — match data enrichment ──────────────────────────────
+
+    @Test
+    void searchDocuments_withTextQuery_includesMatchDataWithTitleOffsets() {
+        UUID docId = UUID.randomUUID();
+        Document doc = Document.builder().id(docId).title("Brief an Anna").build();
+        // chr(1)=\u0001 marks start, chr(2)=\u0002 marks end of highlighted term
+        List<Object[]> rows = Collections.singletonList(new Object[]{docId, "\u0001Brief\u0002 an Anna", null, false, null, null});
+
+        when(documentRepository.findRankedIdsByFts("Brief")).thenReturn(List.of(docId));
+        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class)))
+                .thenReturn(List.of(doc));
+        when(documentRepository.findEnrichmentData(any(), eq("Brief"))).thenReturn(rows);
+
+        DocumentSearchResult result = documentService.searchDocuments(
+                "Brief", null, null, null, null, null, null, null, DocumentSort.RELEVANCE, null);
+
+        assertThat(result.matchData()).containsKey(docId);
+        SearchMatchData md = result.matchData().get(docId);
+        assertThat(md.titleOffsets()).hasSize(1);
+        assertThat(md.titleOffsets().get(0)).isEqualTo(new MatchOffset(0, 5)); // "Brief" = 5 chars at pos 0
+    }
+
+    @Test
+    void searchDocuments_withoutTextQuery_returnsEmptyMatchData() {
+        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class), any(Sort.class)))
+                .thenReturn(List.of());
+
+        DocumentSearchResult result = documentService.searchDocuments(
+                null, null, null, null, null, null, null, null, null, null);
+
+        assertThat(result.matchData()).isEmpty();
+    }
+
+    @Test
+    void searchDocuments_withTextQuery_includesTranscriptionSnippetWhenPresent() {
+        UUID docId = UUID.randomUUID();
+        Document doc = Document.builder().id(docId).title("Dok").build();
+        List<Object[]> rows = Collections.singletonList(new Object[]{docId, "Dok", "Hier ist der Brief aus Berlin", false, null, null});
+
+        when(documentRepository.findRankedIdsByFts("Brief")).thenReturn(List.of(docId));
+        when(documentRepository.findAll(any(org.springframework.data.jpa.domain.Specification.class)))
+                .thenReturn(List.of(doc));
+        when(documentRepository.findEnrichmentData(any(), eq("Brief"))).thenReturn(rows);
+
+        DocumentSearchResult result = documentService.searchDocuments(
+                "Brief", null, null, null, null, null, null, null, DocumentSort.RELEVANCE, null);
+
+        SearchMatchData md = result.matchData().get(docId);
+        assertThat(md.transcriptionSnippet()).isEqualTo("Hier ist der Brief aus Berlin");
+    }
 }