docs(ollama): add model upgrade runbook + post-deploy smoke test to DEPLOYMENT.md

Addresses Elicit's and Sara's review concerns on PR #749:
- Expand §6 ollama_models section into a full model upgrade runbook (step-by-step
  docker volume rm + recreate, including production volume name prefix)
- Add re-deploy idempotency note to §3.4 (init container exits quickly when model
  already present on the volume)
- Add NL search smoke test to §3.4 (curl command distinguishing 200 from 503
  NL_SEARCH_UNAVAILABLE)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.claude/personas/devops.md

@@ -154,9 +154,9 @@ Schedule monthly automated restore tests. If the restore fails, the backup is wo
 ```
 Every alert needs: description, severity, likely cause, resolution steps, escalation path.
 
-3. **Upgrading hardware before profiling**
+3. **Upgrading VPS tier before profiling**
 ```
-# "The app feels slow" → order more RAM / a faster CPU
+# "The app feels slow" → upgrade from CX32 to CX42
 # Actual cause: unindexed query scanning 100k rows
 ```
 Profile with Grafana dashboards first. Most perceived performance issues are application bugs, not resource constraints.
@@ -404,8 +404,8 @@ Hetzner Object Storage (S3-compatible, replaces MinIO in prod)
 Prometheus + Loki + Alertmanager
 ```
 
-### Monthly Cost: ~6 EUR (excl. server)
-Hetzner dedicated server (Serverbörse, i7-6700, 64 GB RAM): see invoice · Object Storage (~200GB): 5 EUR · SMTP relay: ~1 EUR
+### Monthly Cost: ~23 EUR
+CX32 VPS (4 vCPU, 8GB RAM): 17 EUR · Object Storage (~200GB): 5 EUR · SMTP relay: ~1 EUR
 
 ### Reference Documentation
 - Full CI workflow, Gitea vs GitHub differences: `docs/infrastructure/ci-gitea.md`

CLAUDE.md

@@ -86,8 +86,7 @@ backend/src/main/java/org/raddatz/familienarchiv/
 │   └── transcription/   TranscriptionBlock, TranscriptionService, TranscriptionBlockQueryService
 ├── exception/           DomainException, ErrorCode, GlobalExceptionHandler
 ├── filestorage/         FileService (S3/MinIO)
-├── geschichte/          Geschichte (story) domain — GeschichteService, GeschichteQueryService
-│   └── journeyitem/     JourneyItem sub-domain — JourneyItemService, JourneyItemController
+├── geschichte/          Geschichte (story) domain
 ├── importing/           CanonicalImportOrchestrator + four loaders (TagTree/PersonRegister/PersonTree/Document) + CanonicalSheetReader
 ├── notification/        Notification domain + SseEmitterRegistry
 ├── ocr/                 OCR domain — OcrService, OcrBatchService, training
@@ -95,7 +94,6 @@ backend/src/main/java/org/raddatz/familienarchiv/
 │   └── relationship/    PersonRelationship sub-domain
 ├── security/            SecurityConfig, Permission, @RequirePermission, PermissionAspect
 ├── tag/                 Tag domain
-├── timeline/            Timeline (Zeitstrahl) domain — TimelineEvent, EventType, TimelineEventRepository
 └── user/                User domain — AppUser, UserGroup, UserService
 ```
 
@@ -107,16 +105,13 @@ backend/src/main/java/org/raddatz/familienarchiv/
 
 ### Domain Model
 
-| Entity        | Table           | Key relationships                                                                       |
-| ------------- | --------------- | --------------------------------------------------------------------------------------- |
-| `Document`    | `documents`     | ManyToOne `sender` (Person), ManyToMany `receivers` (Person), ManyToMany `tags` (Tag)  |
-| `Person`      | `persons`       | Referenced by documents as sender/receiver                                              |
-| `Tag`         | `tag`           | ManyToMany with documents via `document_tags`                                           |
-| `AppUser`     | `app_users`     | ManyToMany `groups` (UserGroup)                                                         |
-| `UserGroup`   | `user_groups`   | Has a `Set<String> permissions`                                                         |
-| `Geschichte`  | `geschichten`   | `GeschichteType` (`STORY`/`JOURNEY`); ManyToMany `persons` (Person); OneToMany `items` (JourneyItem) |
-| `JourneyItem` | `journey_items` | ManyToOne `geschichte` (Geschichte, ON DELETE CASCADE); ManyToOne `document` (Document, ON DELETE SET NULL); `position`, optional `note` |
-| `TimelineEvent` | `timeline_events` | `EventType` (`PERSONAL`/`HISTORICAL`); ManyToMany `persons` (Person) + `documents` (Document), both join FKs ON DELETE CASCADE; `DatePrecision` date block; `@Version` + NOT NULL `createdBy`/`updatedBy` audit trail |
+| Entity      | Table         | Key relationships                                                                     |
+| ----------- | ------------- | ------------------------------------------------------------------------------------- |
+| `Document`  | `documents`   | ManyToOne `sender` (Person), ManyToMany `receivers` (Person), ManyToMany `tags` (Tag) |
+| `Person`    | `persons`     | Referenced by documents as sender/receiver                                            |
+| `Tag`       | `tag`         | ManyToMany with documents via `document_tags`                                         |
+| `AppUser`   | `app_users`   | ManyToMany `groups` (UserGroup)                                                       |
+| `UserGroup` | `user_groups` | Has a `Set<String> permissions`                                                       |
 
 **`DocumentStatus` lifecycle:** `PLACEHOLDER → UPLOADED → TRANSCRIBED → REVIEWED → ARCHIVED`
 
@@ -157,7 +152,7 @@ Services are annotated with `@Service`, `@RequiredArgsConstructor`, and optional
 
 ### DTOs
 
-Input DTOs live flat in the domain package. Response types are the model entities themselves (no response DTOs) — **except the geschichte domain**, where every response is a view (`GeschichteView`/`GeschichteSummary`/`JourneyItemView`) assembled inside the service transaction and entities never cross the controller boundary. See [ADR-036](./docs/adr/036-geschichte-responses-are-views-not-entities.md) — lazy collections + `open-in-view: false` make serialized entities a 500 waiting to happen.
+Input DTOs live flat in the domain package. Response types are the model entities themselves (no response DTOs).
 
 - `@Schema(requiredMode = REQUIRED)` on every field the backend always populates — drives TypeScript generation.
 
@@ -165,7 +160,7 @@ Input DTOs live flat in the domain package. Response types are the model entitie
 
 → See [CONTRIBUTING.md §Error handling](./CONTRIBUTING.md#error-handling)
 
-**LLM reminder:** use `DomainException.notFound/forbidden/conflict/internal()` from service methods — never throw raw exceptions. When adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) add to `ErrorCode` type in `frontend/src/lib/shared/errors.ts`, (3) add a `case` in `getErrorMessage()`, (4) add i18n keys in `messages/{de,en,es}.json`. Valid error codes include: `TOO_MANY_LOGIN_ATTEMPTS` (returned by `LoginRateLimiter` as HTTP 429 when a brute-force threshold is exceeded); `JOURNEY_NOTE_TOO_LONG`, `JOURNEY_DOCUMENT_ALREADY_ADDED`, `GESCHICHTE_TYPE_IMMUTABLE`, `GESCHICHTE_TITLE_TOO_LONG`, `GESCHICHTE_INTRO_TOO_LONG` (journey/geschichte domain constraints).
+**LLM reminder:** use `DomainException.notFound/forbidden/conflict/internal()` from service methods — never throw raw exceptions. When adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) add to `ErrorCode` type in `frontend/src/lib/shared/errors.ts`, (3) add a `case` in `getErrorMessage()`, (4) add i18n keys in `messages/{de,en,es}.json`. Valid error codes include: `TOO_MANY_LOGIN_ATTEMPTS` (returned by `LoginRateLimiter` as HTTP 429 when a brute-force threshold is exceeded).
 
 ### Security / Permissions
 
@@ -273,7 +268,7 @@ Back button pattern — use the shared `<BackButton>` component from `$lib/share
 
 → See [CONTRIBUTING.md §Error handling](./CONTRIBUTING.md#error-handling)
 
-**LLM reminder:** when adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) add to `ErrorCode` type in `frontend/src/lib/shared/errors.ts`, (3) add a `case` in `getErrorMessage()`, (4) add i18n keys in `messages/{de,en,es}.json`. Valid error codes include: `TOO_MANY_LOGIN_ATTEMPTS` (returned by `LoginRateLimiter` as HTTP 429 when a brute-force threshold is exceeded); `JOURNEY_NOTE_TOO_LONG`, `JOURNEY_DOCUMENT_ALREADY_ADDED`, `GESCHICHTE_TYPE_IMMUTABLE`, `GESCHICHTE_TITLE_TOO_LONG`, `GESCHICHTE_INTRO_TOO_LONG` (journey/geschichte domain constraints).
+**LLM reminder:** when adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) add to `ErrorCode` type in `frontend/src/lib/shared/errors.ts`, (3) add a `case` in `getErrorMessage()`, (4) add i18n keys in `messages/{de,en,es}.json`. Valid error codes include: `TOO_MANY_LOGIN_ATTEMPTS` (returned by `LoginRateLimiter` as HTTP 429 when a brute-force threshold is exceeded).
 
 ---
 

backend/CLAUDE.md

@@ -33,8 +33,7 @@ src/main/java/org/raddatz/familienarchiv/
 │   └── transcription/   # TranscriptionBlock, TranscriptionService, TranscriptionBlockQueryService
 ├── exception/           # DomainException, ErrorCode, GlobalExceptionHandler
 ├── filestorage/         # FileService (S3/MinIO)
-├── geschichte/          # Geschichte (story) domain — GeschichteService, GeschichteQueryService
-│   └── journeyitem/     # JourneyItem sub-domain — JourneyItemService, JourneyItemController
+├── geschichte/          # Geschichte (story) domain
 ├── importing/           # CanonicalImportOrchestrator + 4 loaders + CanonicalSheetReader
 ├── notification/        # Notification domain + SseEmitterRegistry
 ├── ocr/                 # OCR domain — OcrService, OcrBatchService, training
@@ -42,7 +41,6 @@ src/main/java/org/raddatz/familienarchiv/
 │   └── relationship/    # PersonRelationship sub-domain
 ├── security/            # SecurityConfig, Permission, @RequirePermission, PermissionAspect
 ├── tag/                 # Tag domain — Tag, TagService, TagController
-├── timeline/            # Timeline (Zeitstrahl) domain — TimelineEvent, EventType, TimelineEventRepository
 └── user/                # User domain — AppUser, UserGroup, UserService
 ```
 
@@ -68,7 +66,6 @@ For per-domain ownership and public surface, see each domain's `README.md`.
 | `Comment`                   | `document_comments`             | Threaded comments with mentions                                                 |
 | `Notification`              | `notifications`                 | User notification feed                                                          |
 | `OcrJob` / `OcrJobDocument` | `ocr_jobs`, `ocr_job_documents` | Batch OCR job tracking                                                          |
-| `TimelineEvent`             | `timeline_events`               | Curated Zeitstrahl event; ManyToMany persons + documents (join FKs ON DELETE CASCADE); `@Version` + NOT NULL createdBy/updatedBy |
 
 **`DocumentStatus` lifecycle:** `PLACEHOLDER → UPLOADED → TRANSCRIBED → REVIEWED → ARCHIVED`
 

backend/pom.xml

@@ -41,27 +41,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<!-- Force WireMock's ee10 Jetty transitive deps to match Spring Boot's 12.1.8 core -->
-			<dependency>
-				<groupId>org.eclipse.jetty.ee10</groupId>
-				<artifactId>jetty-ee10-servlet</artifactId>
-				<version>12.1.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty.ee10</groupId>
-				<artifactId>jetty-ee10-servlets</artifactId>
-				<version>12.1.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty.ee10</groupId>
-				<artifactId>jetty-ee10-webapp</artifactId>
-				<version>12.1.8</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-ee</artifactId>
-				<version>12.1.8</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
@@ -158,12 +137,6 @@
 			<artifactId>archunit-junit5</artifactId>
 			<version>1.3.0</version>
 			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.wiremock</groupId>
-			<artifactId>wiremock-jetty12</artifactId>
-			<version>3.9.2</version>
-			<scope>test</scope>
 		</dependency>
 				<!-- Excel Bearbeitung (Apache POI) -->
 		<dependency>

backend/src/main/java/org/raddatz/familienarchiv/audit/AuditKind.java

@@ -50,30 +50,10 @@ public enum AuditKind {
     ADMIN_FORCE_LOGOUT,
 
     /** Payload: {@code {"ip": "1.2.3.4", "email": "addr"}} — password NEVER included */
-    LOGIN_RATE_LIMITED,
-
-    // --- Documents ---
-
-    /** Payload: none — the deleted document's id is carried in the documentId column */
-    DOCUMENT_DELETED,
-
-    // --- Reading Journeys (Lesereisen) ---
-
-    /** Payload: {@code {"geschichteId": "uuid", "itemId": "uuid"}} — documentId is null (journey-scoped, not document-scoped) */
-    JOURNEY_ITEM_ADDED,
-
-    /** Payload: {@code {"geschichteId": "uuid", "itemId": "uuid"}} — documentId is null */
-    JOURNEY_ITEM_REMOVED,
-
-    /** Payload: {@code {"geschichteId": "uuid", "itemId": "uuid"}} — documentId is null */
-    JOURNEY_ITEM_NOTE_UPDATED,
-
-    /** Payload: {@code {"geschichteId": "uuid", "itemCount": 3}} — documentId is null; rolled up in chronik */
-    JOURNEY_ITEMS_REORDERED;
+    LOGIN_RATE_LIMITED;
 
     public static final Set<AuditKind> ROLLUP_ELIGIBLE = Set.of(
             TEXT_SAVED, FILE_UPLOADED, ANNOTATION_CREATED,
-            BLOCK_REVIEWED, COMMENT_ADDED, MENTION_CREATED,
-            JOURNEY_ITEMS_REORDERED
+            BLOCK_REVIEWED, COMMENT_ADDED, MENTION_CREATED
     );
 }

backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java

@@ -168,8 +168,8 @@ public class DocumentController {
 
     @DeleteMapping("/{id}")
     @RequirePermission(Permission.WRITE_ALL)
-    public ResponseEntity<Void> deleteDocument(@PathVariable UUID id, Authentication authentication) {
-        documentService.deleteDocument(id, requireUserId(authentication));
+    public ResponseEntity<Void> deleteDocument(@PathVariable UUID id) {
+        documentService.deleteDocument(id);
         return ResponseEntity.noContent().build();
     }
 

backend/src/main/java/org/raddatz/familienarchiv/document/DocumentDeletingEvent.java

@@ -1,11 +0,0 @@
-package org.raddatz.familienarchiv.document;
-
-import java.util.UUID;
-
-/**
- * Published by DocumentService.deleteDocument inside its @Transactional boundary,
- * before documentRepository.deleteById fires. Listeners run synchronously in the
- * publisher's thread and transaction via plain @EventListener — this is load-bearing:
- * see ADR-038.
- */
-public record DocumentDeletingEvent(UUID documentId) {}

backend/src/main/java/org/raddatz/familienarchiv/document/DocumentRepository.java

@@ -36,13 +36,6 @@ public interface DocumentRepository extends JpaRepository<Document, UUID>, JpaSp
     @EntityGraph("Document.list")
     Page<Document> findAll(Pageable pageable);
 
-    // Loader for the relevance fast path: list-item enrichment reads tags after the
-    // repository call returns, so the fetch shape must match the spec-based findAll
-    // overloads above. Plain findAllById carries no entity graph and must not feed
-    // enrichItems — see DocumentService.relevanceSortedPageFromSql.
-    @EntityGraph("Document.list")
-    List<Document> findByIdIn(Collection<UUID> ids);
-
     // Findet ein Dokument anhand des ursprünglichen Dateinamens
     // Wichtig für den Abgleich beim Excel-Import & Datei-Upload
     Optional<Document> findByOriginalFilename(String originalFilename);
@@ -64,7 +57,6 @@ public interface DocumentRepository extends JpaRepository<Document, UUID>, JpaSp
     @EntityGraph("Document.full")
     List<Document> findByReceiversId(UUID receiverId);
 
-
     // Callers access only doc.getTags() to mutate the set — receivers/sender not touched; no graph needed.
     List<Document> findByTags_Id(UUID tagId);
 

backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java

@@ -28,13 +28,10 @@ import org.raddatz.familienarchiv.ocr.TrainingLabel;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.tag.Tag;
 import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import jakarta.persistence.criteria.JoinType;
-import jakarta.persistence.criteria.Predicate;
 import org.springframework.data.jpa.domain.Specification;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
@@ -81,7 +78,6 @@ public class DocumentService {
     private final TranscriptionBlockQueryService transcriptionBlockQueryService;
     private final AuditLogQueryService auditLogQueryService;
     private final ThumbnailAsyncRunner thumbnailAsyncRunner;
-    private final ApplicationEventPublisher eventPublisher;
 
     public record StoreResult(Document document, boolean isNew) {}
 
@@ -853,14 +849,14 @@ public class DocumentService {
         FtsPage ftsPage = toFtsPage(documentRepository.findFtsPageRaw(text, offset, limit));
         if (ftsPage.hits().isEmpty()) return DocumentSearchResult.of(List.of());
 
-        // Preserve ts_rank order from SQL across the JPA findByIdIn call.
+        // Preserve ts_rank order from SQL across the JPA findAllById call.
         Map<UUID, Integer> rankMap = new HashMap<>();
         List<UUID> pageIds = new ArrayList<>();
         for (int i = 0; i < ftsPage.hits().size(); i++) {
             rankMap.put(ftsPage.hits().get(i).id(), i);
             pageIds.add(ftsPage.hits().get(i).id());
         }
-        List<Document> docs = documentRepository.findByIdIn(pageIds).stream()
+        List<Document> docs = documentRepository.findAllById(pageIds).stream()
                 .sorted(Comparator.comparingInt(d -> rankMap.getOrDefault(d.getId(), Integer.MAX_VALUE)))
                 .toList();
         return buildResultPaged(docs, text, pageable, ftsPage.total());
@@ -1008,28 +1004,6 @@ public class DocumentService {
         return doc;
     }
 
-    /**
-     * Lightweight summary lookup for internal use (e.g. journey item append validation).
-     *
-     * <p><strong>Security contract — read before calling:</strong>
-     * <ol>
-     *   <li>This method intentionally bypasses per-document scope checks and
-     *       tag-colour resolution. It must only be invoked after
-     *       {@code @RequirePermission(BLOG_WRITE)} has already been enforced at
-     *       the controller layer, guaranteeing the caller is an authenticated
-     *       author.</li>
-     *   <li>In {@code JourneyItemService.append()}, it is additionally guarded by the
-     *       JOURNEY-type check that fires before this call — so the method is never
-     *       reached for STORY-type Geschichten.</li>
-     * </ol>
-     * Under the current single-tenant model every authenticated author shares the
-     * same document scope, so skipping per-document scope checks is safe.
-     */
-    public Document findSummaryByIdInternal(UUID id) {
-        return documentRepository.findById(id)
-                .orElseThrow(() -> DomainException.notFound(ErrorCode.DOCUMENT_NOT_FOUND, "Document not found: " + id));
-    }
-
     /**
      * Loads a document for the detail view, additionally flagging whether it has any
      * transcription to read. Kept separate from {@link #getDocumentById} so the cheap
@@ -1059,28 +1033,6 @@ public class DocumentService {
         return documentRepository.findByReceiversId(receiverId);
     }
 
-    public DocumentSearchResult searchDocumentsByPersonId(UUID personId, LocalDate from, LocalDate to, Pageable pageable) {
-        Person person = personService.getById(personId);
-        Specification<Document> spec = buildPersonSpec(person, from, to);
-        Page<Document> page = documentRepository.findAll(spec, pageable);
-        List<DocumentListItem> items = enrichItems(page.getContent(), null);
-        return DocumentSearchResult.paged(items, pageable, page.getTotalElements());
-    }
-
-    private Specification<Document> buildPersonSpec(Person person, LocalDate from, LocalDate to) {
-        return (root, query, cb) -> {
-            if (query != null) query.distinct(true);
-            var receiversJoin = root.join("receivers", JoinType.LEFT);
-            var senderPredicate = cb.equal(root.get("sender"), person);
-            var receiverPredicate = cb.equal(receiversJoin, person);
-            var personPredicate = cb.or(senderPredicate, receiverPredicate);
-            var predicates = new ArrayList<>(List.of(personPredicate));
-            if (from != null) predicates.add(cb.greaterThanOrEqualTo(root.get("documentDate"), from));
-            if (to != null) predicates.add(cb.lessThanOrEqualTo(root.get("documentDate"), to));
-            return cb.and(predicates.toArray(new Predicate[0]));
-        };
-    }
-
     public long getIncompleteCount() {
         return documentRepository.countByMetadataCompleteFalse();
     }
@@ -1099,13 +1051,11 @@ public class DocumentService {
     }
 
     @Transactional
-    public void deleteDocument(UUID id, UUID actorId) {
+    public void deleteDocument(UUID id) {
         if (!documentRepository.existsById(id)) {
             throw DomainException.notFound(ErrorCode.DOCUMENT_NOT_FOUND, "Document not found: " + id);
         }
-        eventPublisher.publishEvent(new DocumentDeletingEvent(id));
         documentRepository.deleteById(id);
-        auditService.logAfterCommit(AuditKind.DOCUMENT_DELETED, actorId, id, null);
     }
 
     @Transactional

backend/src/main/java/org/raddatz/familienarchiv/exception/DomainException.java

@@ -78,8 +78,4 @@ public class DomainException extends RuntimeException {
     public static DomainException tooManyRequests(ErrorCode code, String message, long retryAfterSeconds) {
         return new DomainException(code, HttpStatus.TOO_MANY_REQUESTS, message, retryAfterSeconds);
     }
-
-    public static DomainException serviceUnavailable(ErrorCode code, String message) {
-        return new DomainException(code, HttpStatus.SERVICE_UNAVAILABLE, message);
-    }
 }

backend/src/main/java/org/raddatz/familienarchiv/exception/ErrorCode.java

@@ -15,10 +15,6 @@ public enum ErrorCode {
     ALIAS_NOT_FOUND,
     /** The submitted personType value is not allowed (e.g. SKIP is import-only). 400 */
     INVALID_PERSON_TYPE,
-    /** A person's birth date is after their death date. 400 */
-    BIRTH_AFTER_DEATH,
-    /** A life date and its precision are incoherent: date present with UNKNOWN precision, or precision set without a date. 400 */
-    INVALID_DATE_PRECISION,
     // --- Documents ---
     /** A document with the given ID does not exist. 404 */
     DOCUMENT_NOT_FOUND,
@@ -126,22 +122,6 @@ public enum ErrorCode {
     // --- Geschichten (Stories) ---
     /** A Geschichte (story) with the given ID does not exist, or is a DRAFT and the caller lacks BLOG_WRITE. 404 */
     GESCHICHTE_NOT_FOUND,
-    /** A JourneyItem with the given ID does not exist, or belongs to a different journey (IDOR). 404 */
-    JOURNEY_ITEM_NOT_FOUND,
-    /** A position uniqueness conflict occurred on the journey_items table — concurrent append or reorder. 409 */
-    JOURNEY_ITEM_POSITION_CONFLICT,
-    /** The journey already has the maximum allowed number of items (100). 400 */
-    JOURNEY_AT_CAPACITY,
-    /** The document is already present in this journey — duplicate items are not allowed. 409 */
-    JOURNEY_DOCUMENT_ALREADY_ADDED,
-    /** The type of an existing Geschichte cannot be changed via PATCH. 409 */
-    GESCHICHTE_TYPE_IMMUTABLE,
-    /** A journey-item note exceeds the maximum length (2000 characters). 400 */
-    JOURNEY_NOTE_TOO_LONG,
-    /** A Geschichte title exceeds the maximum length (255 characters — the DB column bound). 400 */
-    GESCHICHTE_TITLE_TOO_LONG,
-    /** A JOURNEY intro (body) exceeds the maximum length (4000 characters). 400 */
-    GESCHICHTE_INTRO_TOO_LONG,
 
     // --- Tags ---
     /** A tag with the given ID does not exist. 404 */

backend/src/main/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandler.java

@@ -78,14 +78,7 @@ public class GlobalExceptionHandler {
         // Log the constraint NAME only — schema metadata, safe for Loki, and enough to tell which
         // constraint fired at 2am. Never pass `ex` / `ex.getMessage()`: those embed the SQL + the
         // offending values (CWE-209). No Sentry: an integrity violation is a 400, not a system fault.
-        String constraint = constraintNameOf(ex);
-        log.warn("Rejected a request that violated a database integrity constraint: {}", constraint);
-        if ("uq_journey_items_geschichte_position".equals(constraint)) {
-            // DEFERRABLE INITIALLY DEFERRED — fires at commit when concurrent appends/reorders collide
-            return ResponseEntity.status(409)
-                    .body(new ErrorResponse(ErrorCode.JOURNEY_ITEM_POSITION_CONFLICT,
-                            "A position conflict was detected — another request modified this journey simultaneously"));
-        }
+        log.warn("Rejected a request that violated a database integrity constraint: {}", constraintNameOf(ex));
         return ResponseEntity.badRequest()
                 .body(new ErrorResponse(ErrorCode.VALIDATION_ERROR, "The submitted data violated a database constraint"));
     }

backend/src/main/java/org/raddatz/familienarchiv/geschichte/Geschichte.java

@@ -5,14 +5,12 @@ import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItem;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.person.Person;
 
+import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.document.Document;
+import org.raddatz.familienarchiv.person.Person;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -42,12 +40,6 @@ public class Geschichte {
     @Builder.Default
     private GeschichteStatus status = GeschichteStatus.DRAFT;
 
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    @Builder.Default
-    private GeschichteType type = GeschichteType.STORY;
-
     @ManyToOne
     @JoinColumn(name = "author_id")
     private AppUser author;
@@ -59,18 +51,12 @@ public class Geschichte {
     @Builder.Default
     private Set<Person> persons = new HashSet<>();
 
-    // LAZY per docs/adr/022-eager-to-lazy-fetch-strategy.md. open-in-view is FALSE
-    // (application.yaml), so this collection is DEAD at Jackson serialization time unless
-    // explicitly initialized inside the service transaction. getById() is
-    // @Transactional(readOnly=true) AND calls getItems().size() to force-init before return.
-    // list() must NOT serialize items at all — it returns a GeschichteSummary projection.
-    // This is the first List ("bag") collection on Geschichte — adding a second EAGER/
-    // fetch-joined List here will throw MultipleBagFetchException at boot.
-    @OneToMany(mappedBy = "geschichte", cascade = CascadeType.ALL, orphanRemoval = true,
-               fetch = FetchType.LAZY)
-    @OrderBy("position ASC")
+    @ManyToMany(fetch = FetchType.EAGER)
+    @JoinTable(name = "geschichten_documents",
+            joinColumns = @JoinColumn(name = "geschichte_id"),
+            inverseJoinColumns = @JoinColumn(name = "document_id"))
     @Builder.Default
-    private List<JourneyItem> items = new ArrayList<>();
+    private Set<Document> documents = new HashSet<>();
 
     @CreationTimestamp
     @Column(updatable = false)

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteController.java

@@ -1,15 +1,12 @@
 package org.raddatz.familienarchiv.geschichte;
 
 import lombok.RequiredArgsConstructor;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemCreateDTO;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemService;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemUpdateDTO;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemView;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyReorderDTO;
+import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
+import org.raddatz.familienarchiv.geschichte.Geschichte;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.security.RequirePermission;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
+import org.raddatz.familienarchiv.geschichte.GeschichteService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,7 +14,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -32,17 +28,12 @@ import java.util.UUID;
 public class GeschichteController {
 
     private final GeschichteService geschichteService;
-    private final JourneyItemService journeyItemService;
 
     @GetMapping
-    public List<GeschichteSummary> list(
-            @Parameter(description = "Filter by status. Callers without BLOG_WRITE always receive PUBLISHED results regardless of the value passed. Callers with BLOG_WRITE requesting DRAFT receive only their own unpublished stories.")
+    public List<Geschichte> list(
             @RequestParam(required = false) GeschichteStatus status,
-            @Parameter(description = "AND-filter: story must include all supplied person IDs.")
             @RequestParam(name = "personId", required = false) List<UUID> personIds,
-            @Parameter(description = "Filter to stories containing this document.")
             @RequestParam(required = false) UUID documentId,
-            @Parameter(description = "Maximum results to return. Values ≤ 0 default to 50. Clamped at 200.")
             @RequestParam(required = false, defaultValue = "50") int limit) {
         return geschichteService.list(
                 status,
@@ -52,20 +43,20 @@ public class GeschichteController {
     }
 
     @GetMapping("/{id}")
-    public GeschichteView getById(@PathVariable UUID id) {
-        return geschichteService.getView(id);
+    public Geschichte getById(@PathVariable UUID id) {
+        return geschichteService.getById(id);
     }
 
     @PostMapping
     @RequirePermission(Permission.BLOG_WRITE)
-    public ResponseEntity<GeschichteView> create(@RequestBody GeschichteUpdateDTO dto) {
-        GeschichteView created = geschichteService.create(dto);
+    public ResponseEntity<Geschichte> create(@RequestBody GeschichteUpdateDTO dto) {
+        Geschichte created = geschichteService.create(dto);
         return ResponseEntity.status(HttpStatus.CREATED).body(created);
     }
 
     @PatchMapping("/{id}")
     @RequirePermission(Permission.BLOG_WRITE)
-    public GeschichteView update(@PathVariable UUID id, @RequestBody GeschichteUpdateDTO dto) {
+    public Geschichte update(@PathVariable UUID id, @RequestBody GeschichteUpdateDTO dto) {
         return geschichteService.update(id, dto);
     }
 
@@ -75,45 +66,4 @@ public class GeschichteController {
         geschichteService.delete(id);
         return ResponseEntity.noContent().build();
     }
-
-    // ─── JourneyItem CRUD ────────────────────────────────────────────────────
-
-    @PostMapping("/{id}/items")
-    @RequirePermission(Permission.BLOG_WRITE)
-    public ResponseEntity<JourneyItemView> appendItem(
-            @PathVariable UUID id,
-            @RequestBody JourneyItemCreateDTO dto) {
-        JourneyItemView view = journeyItemService.append(id, dto);
-        return ResponseEntity.status(HttpStatus.CREATED).body(view);
-    }
-
-    @PatchMapping("/{id}/items/{itemId}")
-    @RequirePermission(Permission.BLOG_WRITE)
-    public JourneyItemView updateItemNote(
-            @PathVariable UUID id,
-            @PathVariable UUID itemId,
-            @RequestBody JourneyItemUpdateDTO dto) {
-        return journeyItemService.updateNote(id, itemId, dto);
-    }
-
-    @DeleteMapping("/{id}/items/{itemId}")
-    @RequirePermission(Permission.BLOG_WRITE)
-    public ResponseEntity<Void> deleteItem(
-            @PathVariable UUID id,
-            @PathVariable UUID itemId) {
-        journeyItemService.delete(id, itemId);
-        return ResponseEntity.noContent().build();
-    }
-
-    @PutMapping("/{id}/items/reorder")
-    @RequirePermission(Permission.BLOG_WRITE)
-    @Operation(
-        summary = "Reorder journey items",
-        description = "itemIds must contain ALL item IDs for the given journey in the desired new order. Sending a partial list returns 400 Bad Request."
-    )
-    public List<JourneyItemView> reorderItems(
-            @PathVariable UUID id,
-            @RequestBody JourneyReorderDTO dto) {
-        return journeyItemService.reorder(id, dto);
-    }
 }

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteQueryService.java

@@ -1,29 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.Optional;
-import java.util.UUID;
-
-/**
- * Thin read-only service owning {@link GeschichteRepository}.
- * Exists so that {@code JourneyItemService} can check Geschichte existence
- * and load Geschichte instances without holding a direct reference to the
- * Geschichte repository (cross-domain repository access is not allowed per
- * layering rules).
- */
-@Service
-@RequiredArgsConstructor
-public class GeschichteQueryService {
-
-    private final GeschichteRepository geschichteRepository;
-
-    public boolean existsById(UUID id) {
-        return geschichteRepository.existsById(id);
-    }
-
-    public Optional<Geschichte> findById(UUID id) {
-        return geschichteRepository.findById(id);
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteRepository.java

@@ -1,47 +1,12 @@
 package org.raddatz.familienarchiv.geschichte;
 
+import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.UUID;
 
 @Repository
 public interface GeschichteRepository extends JpaRepository<Geschichte, UUID>, JpaSpecificationExecutor<Geschichte> {
-
-    /**
-     * Returns the grid projection. Never carries items (avoids lazy-init 500 under open-in-view:false).
-     *
-     * <p>Status clamp: callers must pass the effective status (PUBLISHED for readers,
-     * raw status for BLOG_WRITE users). authorId restricts to own drafts when effective=DRAFT.
-     *
-     * <p>Person filter: personCount=0 disables the filter. When personCount>0, the story must
-     * be associated with ALL person ids in personIds (AND-semantics via counting subquery).
-     * Pass a non-empty personIds collection when personCount>0 — empty IN() is invalid SQL.
-     */
-    @Query("""
-            SELECT g.id AS id, g.title AS title, g.status AS status, g.type AS type,
-                   g.author AS author, g.publishedAt AS publishedAt, g.updatedAt AS updatedAt, g.body AS body
-            FROM Geschichte g
-            WHERE g.status = :effectiveStatus
-              AND (:authorId IS NULL OR g.author.id = :authorId)
-              AND (:personCount = 0 OR
-                   (SELECT COUNT(DISTINCT p.id)
-                    FROM Geschichte g2 JOIN g2.persons p
-                    WHERE g2.id = g.id AND p.id IN :personIds) = :personCount)
-              AND (:documentId IS NULL OR
-                   EXISTS (SELECT 1 FROM JourneyItem ji
-                           WHERE ji.geschichte = g AND ji.document.id = :documentId))
-            ORDER BY COALESCE(g.publishedAt, g.updatedAt) DESC
-            """)
-    List<GeschichteSummary> findSummaries(
-            @Param("effectiveStatus") GeschichteStatus effectiveStatus,
-            @Param("authorId") UUID authorId,
-            @Param("personIds") Collection<UUID> personIds,
-            @Param("personCount") long personCount,
-            @Param("documentId") UUID documentId);
 }

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteService.java

@@ -4,23 +4,28 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.owasp.html.HtmlPolicyBuilder;
 import org.owasp.html.PolicyFactory;
+import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemService;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemView;
 import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.document.Document;
+import org.raddatz.familienarchiv.geschichte.Geschichte;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.person.Person;
+import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
+import org.raddatz.familienarchiv.geschichte.GeschichteSpecifications;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.person.PersonService;
 import org.raddatz.familienarchiv.user.UserService;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -36,7 +41,6 @@ public class GeschichteService {
     private final PersonService personService;
     private final DocumentService documentService;
     private final UserService userService;
-    private final JourneyItemService journeyItemService;
 
     /**
      * Allow-list policy for Geschichte body HTML. Tiptap on the writer side
@@ -50,26 +54,12 @@ public class GeschichteService {
     private static final int DEFAULT_LIMIT = 50;
     private static final int MAX_LIMIT = 200;
 
-    /** Sentinel used when {@code personIds} is empty to avoid invalid empty IN() SQL. */
-    private static final UUID NIL_UUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
-
-    // Matches the geschichten.title VARCHAR(255) column (V58) — the service check
-    // turns what would be a DB-level 500 into a friendly 400.
-    static final int MAX_TITLE_LENGTH = 255;
-    // JOURNEY intros travel the verbatim (unsanitized) write path, so they get the
-    // same three-layer bound as journey notes: frontend maxlength, this check, and
-    // the V75 CHECK constraint. STORY bodies are sanitized Tiptap HTML and stay
-    // unbounded on purpose.
-    static final int MAX_INTRO_LENGTH = 4000;
-
     // ─── Read API ────────────────────────────────────────────────────────────
 
     public long countPublished() {
         return geschichteRepository.count(GeschichteSpecifications.hasStatus(GeschichteStatus.PUBLISHED));
     }
 
-    // readOnly = true: lazy collections resolve within the same tx when called from getView()
-    @Transactional(readOnly = true)
     public Geschichte getById(UUID id) {
         Geschichte g = geschichteRepository.findById(id)
                 .orElseThrow(() -> DomainException.notFound(
@@ -82,62 +72,24 @@ public class GeschichteService {
         return g;
     }
 
-    @Transactional(readOnly = true)
-    public GeschichteView getView(UUID id) {
-        Geschichte g = getById(id);
-        List<JourneyItemView> items = journeyItemService.getItems(id);
-        return toView(g, items);
-    }
-
-    GeschichteView toView(Geschichte g, List<JourneyItemView> items) {
-        AppUser author = g.getAuthor();
-        GeschichteView.AuthorView authorView = null;
-        if (author != null) {
-            String displayName = PersonNameFormatter.join(author.getFirstName(), author.getLastName());
-            if (displayName.isBlank()) displayName = "[Unbekannt]";
-            authorView = new GeschichteView.AuthorView(author.getId(), displayName);
-        }
-        Set<GeschichteView.PersonView> personViews = new HashSet<>();
-        for (Person p : g.getPersons()) {
-            personViews.add(new GeschichteView.PersonView(p.getId(), p.getFirstName(), p.getLastName()));
-        }
-        return new GeschichteView(
-                g.getId(), g.getTitle(), g.getBody(),
-                g.getStatus(), g.getType(),
-                authorView, personViews,
-                items,
-                g.getPublishedAt(), g.getCreatedAt(), g.getUpdatedAt()
-        );
-    }
-
     /**
      * Lists Geschichten with optional filters. {@code personIds} uses AND semantics: the story
      * must be associated with every person id supplied. An empty or null list applies no
      * person filter. Result is ordered by {@code COALESCE(publishedAt, updatedAt) DESC}.
-     *
-     * <p>Returns a {@link GeschichteSummary} projection — never carries items, preventing
-     * LazyInitializationException on the non-transactional list path.
-     *
-     * <p>Security: {@code null} status always resolves to PUBLISHED — even for blog writers.
-     * Only an explicit {@code DRAFT} request scopes the query to the caller's own drafts.
-     * This prevents CWE-639: a blog writer passing {@code null} must not see all authors' drafts.
      */
-    public List<GeschichteSummary> list(GeschichteStatus status, List<UUID> personIds, UUID documentId, int limit) {
-        boolean isDraftRequest = currentUserHasBlogWrite() && status == GeschichteStatus.DRAFT;
-        GeschichteStatus effective = isDraftRequest ? GeschichteStatus.DRAFT : GeschichteStatus.PUBLISHED;
+    public List<Geschichte> list(GeschichteStatus status, List<UUID> personIds, UUID documentId, int limit) {
+        GeschichteStatus effective = currentUserHasBlogWrite() ? status : GeschichteStatus.PUBLISHED;
         int safeLimit = limit <= 0 ? DEFAULT_LIMIT : Math.min(limit, MAX_LIMIT);
 
-        UUID authorId = isDraftRequest ? currentUser().getId() : null;
-
-        // When personIds is empty, personCount=0 short-circuits the IN() predicate.
-        // Pass a sentinel UUID to avoid invalid empty IN() SQL while the predicate is skipped.
-        Collection<UUID> safePersonIds = (personIds == null || personIds.isEmpty())
-                ? List.of(NIL_UUID)
-                : personIds;
-        long personCount = (personIds == null) ? 0 : personIds.size();
-
-        return geschichteRepository
-                .findSummaries(effective, authorId, safePersonIds, personCount, documentId)
+        UUID authorId = effective == GeschichteStatus.DRAFT ? currentUser().getId() : null;
+        Specification<Geschichte> spec = Specification.allOf(
+                GeschichteSpecifications.hasStatus(effective),
+                GeschichteSpecifications.hasAuthor(authorId),
+                GeschichteSpecifications.hasAllPersons(personIds),
+                GeschichteSpecifications.hasDocument(documentId),
+                GeschichteSpecifications.orderByDisplayDateDesc()
+        );
+        return geschichteRepository.findAll(spec, Sort.unsorted())
                 .stream()
                 .limit(safeLimit)
                 .toList();
@@ -145,57 +97,46 @@ public class GeschichteService {
 
     // ─── Write API ───────────────────────────────────────────────────────────
 
-    // Write methods return GeschichteView, never the entity: Jackson serializes after
-    // the transaction closed, where the lazy items collection is a dead proxy.
-    // The view is assembled in-transaction, so no force-init tricks are needed.
-
     @Transactional
-    public GeschichteView create(GeschichteUpdateDTO dto) {
+    public Geschichte create(GeschichteUpdateDTO dto) {
         requireTitle(dto.getTitle());
-        GeschichteType type = dto.getType() != null ? dto.getType() : GeschichteType.STORY;
         Geschichte g = Geschichte.builder()
                 .title(dto.getTitle().trim())
-                .body(bodyForType(type, dto.getBody()))
+                .body(sanitize(dto.getBody()))
                 .status(GeschichteStatus.DRAFT)
-                .type(type)
                 .author(currentUser())
                 .persons(resolvePersons(dto.getPersonIds()))
+                .documents(resolveDocuments(dto.getDocumentIds()))
                 .build();
         if (dto.getStatus() == GeschichteStatus.PUBLISHED) {
             g.setStatus(GeschichteStatus.PUBLISHED);
             g.setPublishedAt(LocalDateTime.now());
         }
-        Geschichte saved = geschichteRepository.save(g);
-        // A freshly created Geschichte has no items by construction — items are only
-        // addable via the separate /items endpoints. Revisit if a create DTO ever
-        // accepts initial items.
-        return toView(saved, List.of());
+        return geschichteRepository.save(g);
     }
 
     @Transactional
-    public GeschichteView update(UUID id, GeschichteUpdateDTO dto) {
+    public Geschichte update(UUID id, GeschichteUpdateDTO dto) {
         Geschichte g = geschichteRepository.findById(id)
                 .orElseThrow(() -> DomainException.notFound(
                         ErrorCode.GESCHICHTE_NOT_FOUND, "Geschichte not found: " + id));
-        if (dto.getType() != null && dto.getType() != g.getType()) {
-            throw DomainException.conflict(ErrorCode.GESCHICHTE_TYPE_IMMUTABLE,
-                    "The type of a Geschichte cannot be changed after creation");
-        }
         if (dto.getTitle() != null) {
             requireTitle(dto.getTitle());
             g.setTitle(dto.getTitle().trim());
         }
         if (dto.getBody() != null) {
-            g.setBody(bodyForType(g.getType(), dto.getBody()));
+            g.setBody(sanitize(dto.getBody()));
         }
         if (dto.getPersonIds() != null) {
             g.setPersons(resolvePersons(dto.getPersonIds()));
         }
+        if (dto.getDocumentIds() != null) {
+            g.setDocuments(resolveDocuments(dto.getDocumentIds()));
+        }
         if (dto.getStatus() != null && dto.getStatus() != g.getStatus()) {
             applyStatusTransition(g, dto.getStatus());
         }
-        Geschichte saved = geschichteRepository.save(g);
-        return toView(saved, journeyItemService.getItems(id));
+        return geschichteRepository.save(g);
     }
 
     @Transactional
@@ -223,27 +164,6 @@ public class GeschichteService {
             throw DomainException.badRequest(
                     ErrorCode.VALIDATION_ERROR, "Title is required");
         }
-        if (title.trim().length() > MAX_TITLE_LENGTH) {
-            throw DomainException.badRequest(ErrorCode.GESCHICHTE_TITLE_TOO_LONG,
-                    "Title exceeds maximum length of " + MAX_TITLE_LENGTH + " characters");
-        }
-    }
-
-    /**
-     * STORY bodies are Tiptap HTML and go through the OWASP allow-list sanitizer.
-     * JOURNEY intros are plain text: the reader renders them via Svelte text
-     * interpolation (never {@code {@html}}), so entity-encoding them here would
-     * corrupt content ("&" → "&amp;") and re-encode on every editor round-trip.
-     */
-    private String bodyForType(GeschichteType type, String body) {
-        if (type != GeschichteType.JOURNEY) {
-            return sanitize(body);
-        }
-        if (body != null && body.length() > MAX_INTRO_LENGTH) {
-            throw DomainException.badRequest(ErrorCode.GESCHICHTE_INTRO_TOO_LONG,
-                    "Intro exceeds maximum length of " + MAX_INTRO_LENGTH + " characters");
-        }
-        return body;
     }
 
     private String sanitize(String body) {
@@ -256,6 +176,15 @@ public class GeschichteService {
         return new LinkedHashSet<>(personService.getAllById(ids));
     }
 
+    private Set<Document> resolveDocuments(List<UUID> ids) {
+        if (ids == null || ids.isEmpty()) return new HashSet<>();
+        Set<Document> out = new LinkedHashSet<>();
+        for (UUID id : ids) {
+            out.add(documentService.getDocumentById(id));
+        }
+        return out;
+    }
+
     private AppUser currentUser() {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth == null || !auth.isAuthenticated()) {

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSpecifications.java

@@ -6,6 +6,9 @@ import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 import jakarta.persistence.criteria.Subquery;
+import org.raddatz.familienarchiv.document.Document;
+import org.raddatz.familienarchiv.geschichte.Geschichte;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.person.Person;
 import org.springframework.data.jpa.domain.Specification;
 
@@ -45,7 +48,12 @@ public final class GeschichteSpecifications {
                 authorId == null ? null : cb.equal(root.get("author").get("id"), authorId);
     }
 
-    // TODO(lesereisen-editor): restore document filter via journey_items join when editor lands
+    public static Specification<Geschichte> hasDocument(UUID documentId) {
+        return (root, query, cb) -> {
+            if (documentId == null) return null;
+            return cb.exists(documentSubquery(root, query, cb, documentId));
+        };
+    }
 
     /**
      * AND-filter across persons: the Geschichte must be associated with EVERY id in {@code personIds}.
@@ -76,4 +84,14 @@ public final class GeschichteSpecifications {
         return sub;
     }
 
+    private static Subquery<UUID> documentSubquery(
+            Root<Geschichte> root, CriteriaQuery<?> query, CriteriaBuilder cb, UUID documentId) {
+        Subquery<UUID> sub = query.subquery(UUID.class);
+        Root<Geschichte> subRoot = sub.from(Geschichte.class);
+        Join<Geschichte, Document> documents = subRoot.join("documents");
+        sub.select(subRoot.get("id"))
+                .where(cb.equal(subRoot.get("id"), root.get("id")),
+                        cb.equal(documents.get("id"), documentId));
+        return sub;
+    }
 }

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteSummary.java

@@ -1,45 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.time.LocalDateTime;
-import java.util.UUID;
-
-/**
- * List-projection for the /api/geschichten grid. Never carries items — avoids
- * LazyInitializationException (open-in-view: false) and prevents Cartesian joins.
- * Mirrors the PersonSummaryDTO precedent.
- *
- * <p>Field set: exactly what the live grid card renders (title, author byline, body excerpt,
- * publishedAt, status, type). Does NOT carry items or persons.
- */
-public interface GeschichteSummary {
-
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    UUID getId();
-
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    String getTitle();
-
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    GeschichteStatus getStatus();
-
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    GeschichteType getType();
-
-    /** Nested closed projection — exposes only the fields the grid card needs. */
-    AuthorSummary getAuthor();
-
-    LocalDateTime getPublishedAt();
-
-    /** Always set (@UpdateTimestamp) — drives "bearbeitet vor X" on dashboard cards. */
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    LocalDateTime getUpdatedAt();
-
-    String getBody();
-
-    /** Author projection — names only; never email or group memberships (same rule as GeschichteView.AuthorView). */
-    interface AuthorSummary {
-        String getFirstName();
-        String getLastName();
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteType.java

@@ -1,6 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-public enum GeschichteType {
-    STORY,
-    JOURNEY
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteUpdateDTO.java

@@ -1,6 +1,7 @@
 package org.raddatz.familienarchiv.geschichte;
 
 import lombok.Data;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 
 import java.util.List;
 import java.util.UUID;
@@ -15,6 +16,6 @@ public class GeschichteUpdateDTO {
     private String title;
     private String body;
     private GeschichteStatus status;
-    private GeschichteType type;
     private List<UUID> personIds;
+    private List<UUID> documentIds;
 }

backend/src/main/java/org/raddatz/familienarchiv/geschichte/GeschichteView.java

@@ -1,41 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemView;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * Detail-view response for GET /api/geschichten/{id}. Assembled by
- * GeschichteService — never the raw entity (author AppUser graph must not leak).
- * items is always present (both STORY and JOURNEY); empty list for stories with no items.
- */
-public record GeschichteView(
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String title,
-        String body,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) GeschichteStatus status,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) GeschichteType type,
-        AuthorView author,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) Set<PersonView> persons,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) List<JourneyItemView> items,
-        LocalDateTime publishedAt,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) LocalDateTime createdAt,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) LocalDateTime updatedAt
-) {
-    /** Summarised author — exposes only id and displayName, never email or group memberships. */
-    public record AuthorView(
-            @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
-            @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String displayName
-    ) {}
-
-    /** Summarised person — exposes only id, firstName, and lastName. No admin-only fields. */
-    public record PersonView(
-            @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
-            String firstName,
-            String lastName
-    ) {}
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/PersonNameFormatter.java

@@ -1,22 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-/**
- * Utility for joining a person's first and last name into a display string.
- * Centralises the logic that was previously duplicated across GeschichteService
- * and JourneyItemService.
- */
-public class PersonNameFormatter {
-
-    private PersonNameFormatter() {
-        // utility class — no instances
-    }
-
-    public static String join(String firstName, String lastName) {
-        String first = firstName != null ? firstName.trim() : "";
-        String last = lastName != null ? lastName.trim() : "";
-        if (first.isEmpty() && last.isEmpty()) return "";
-        if (first.isEmpty()) return last;
-        if (last.isEmpty()) return first;
-        return first + " " + last;
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/DocumentSummary.java

@@ -1,23 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.raddatz.familienarchiv.document.DatePrecision;
-
-import java.time.LocalDate;
-import java.util.UUID;
-
-/**
- * Lean read-model view of a Document for embedding in JourneyItemView.
- * Built by JourneyItemService.toSummary(Document) — never serialised from
- * a JPA entity to avoid LazyInitializationException and tag-color overhead.
- */
-public record DocumentSummary(
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) String title,
-        LocalDate documentDate,
-        LocalDate documentDateEnd,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) DatePrecision datePrecision,
-        String senderName,
-        String receiverName,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) Integer receiverCount
-) {}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItem.java

@@ -1,54 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.*;
-import lombok.*;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-
-import java.util.UUID;
-
-@Entity
-@Table(name = "journey_items")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class JourneyItem {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private UUID id;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "geschichte_id", nullable = false)
-    @JsonIgnore
-    private Geschichte geschichte;
-
-    // Sort key; gaps fine. Duplicate positions within a journey yield undefined relative order
-    // — the editor is responsible for keeping them distinct.
-    @Column(nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private int position;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "document_id")
-    @JsonIgnore
-    private Document document;
-
-    /**
-     * Plain text — not HTML-sanitized. Renderers MUST NOT use {@code @html} or equivalent unsafe output.
-     *
-     * <p>CWE-79 tripwire: stored verbatim; only Svelte {note} interpolation is auto-safe.</p>
-     */
-    @Column(columnDefinition = "TEXT")
-    private String note;
-
-    // JPA uses field access — this getter is not persisted. Jackson serializes it as documentId.
-    // Exposing only the UUID prevents circular references and large nested payloads.
-    public UUID getDocumentId() {
-        return document != null ? document.getId() : null;
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemCreateDTO.java

@@ -1,12 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import lombok.Data;
-
-import java.util.UUID;
-
-/** Input for POST /api/geschichten/{id}/items. Both fields optional; at least one must be present. */
-@Data
-public class JourneyItemCreateDTO {
-    private UUID documentId;
-    private String note;
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemDocumentDeleteListener.java

@@ -1,30 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.document.DocumentDeletingEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-
-@Component
-@RequiredArgsConstructor
-@Slf4j
-class JourneyItemDocumentDeleteListener {
-
-    private final JourneyItemRepository journeyItemRepository;
-
-    /**
-     * Plain @EventListener — runs synchronously in the publisher's thread and transaction.
-     * Load-bearing choice: AFTER_COMMIT would fire after the FK ON DELETE SET NULL has
-     * already 500'd; @Async would run outside the delete transaction (breaks AC-5 rollback).
-     * See ADR-038. DocumentService cannot call JourneyItemService directly because
-     * Spring Framework 7 prohibits the resulting constructor-injection cycle.
-     */
-    @EventListener
-    void onDocumentDeleting(DocumentDeletingEvent event) {
-        int deleted = journeyItemRepository.deleteNoteLessByDocumentId(event.documentId());
-        if (deleted > 0) {
-            log.warn("Cascade-deleted {} note-less journey item(s) for document {}", deleted, event.documentId());
-        }
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemRepository.java

@@ -1,69 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-
-@Repository
-public interface JourneyItemRepository extends JpaRepository<JourneyItem, UUID> {
-
-    /** Returns items ordered by position ASC for the read-model assembly path. */
-    List<JourneyItem> findByGeschichteIdOrderByPosition(UUID geschichteId);
-
-    /** IDOR-safe lookup: returns empty when itemId exists but belongs to a different journey. */
-    Optional<JourneyItem> findByIdAndGeschichteId(UUID id, UUID geschichteId);
-
-    /** Returns only the IDs — used for set-equality check in reorder. */
-    @Query("SELECT i.id FROM JourneyItem i WHERE i.geschichte.id = :geschichteId")
-    Set<UUID> findIdsByGeschichteId(@Param("geschichteId") UUID geschichteId);
-
-    /** MAX position for computing the next append position; returns empty when journey has no items. */
-    @Query("SELECT MAX(i.position) FROM JourneyItem i WHERE i.geschichte.id = :geschichteId")
-    Optional<Integer> findMaxPositionByGeschichteId(@Param("geschichteId") UUID geschichteId);
-
-    /** COUNT for the 100-item cap check — COUNT(*)-based, never MAX(position)-derived. */
-    long countByGeschichteId(UUID geschichteId);
-
-    /**
-     * Dedup guard: true when the document is already linked to this journey.
-     * Explicit JPQL, not a derived query: the transient {@code getDocumentId()}
-     * getter on JourneyItem makes Spring Data resolve the derived path as a
-     * direct {@code documentId} attribute, which Hibernate cannot map.
-     */
-    @Query("""
-            SELECT COUNT(i) > 0 FROM JourneyItem i
-            WHERE i.geschichte.id = :geschichteId AND i.document.id = :documentId
-            """)
-    boolean existsByGeschichteIdAndDocumentId(
-            @Param("geschichteId") UUID geschichteId, @Param("documentId") UUID documentId);
-
-    /**
-     * Deletes note-less items (note IS NULL or note = '') linked to the given document.
-     * Used by JourneyItemDocumentDeleteListener before the document row is removed, so
-     * the FK ON DELETE SET NULL never fires on rows that would violate chk_journey_item_not_empty.
-     * Explicit JPQL — same trap as existsByGeschichteIdAndDocumentId: the transient
-     * getDocumentId() getter makes Spring Data unable to resolve a derived query path.
-     * clearAutomatically = true invalidates the L1 cache so AC-2's "note-carrying survives"
-     * assertion never reads a stale entity. flushAutomatically = true makes the
-     * flush-before-delete contract explicit rather than relying on Hibernate AUTO flush mode.
-     */
-    @Modifying(clearAutomatically = true, flushAutomatically = true)
-    @Query("DELETE FROM JourneyItem i WHERE i.document.id = :documentId AND (i.note IS NULL OR i.note = '')")
-    int deleteNoteLessByDocumentId(@Param("documentId") UUID documentId);
-
-    /**
-     * Loads journey items with their linked Document in a single JOIN FETCH query,
-     * eliminating the N+1 SELECT that would occur when accessing item.getDocument()
-     * lazily for each item. Items without a document (note-only) are included via
-     * LEFT JOIN. Ordered by position ASC.
-     */
-    @Query("SELECT ji FROM JourneyItem ji LEFT JOIN FETCH ji.document WHERE ji.geschichte.id = :geschichteId ORDER BY ji.position ASC")
-    List<JourneyItem> findByGeschichteIdWithDocument(@Param("geschichteId") UUID geschichteId);
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemService.java

@@ -1,276 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.raddatz.familienarchiv.audit.AuditKind;
-import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.document.DatePrecision;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-import org.raddatz.familienarchiv.geschichte.GeschichteQueryService;
-import org.raddatz.familienarchiv.geschichte.PersonNameFormatter;
-import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.UserService;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class JourneyItemService {
-
-    static final int MAX_ITEMS = 100;
-    static final int POSITION_STEP = 10;
-    // 2000 per the editor spec — frontend maxlength and the i18n error message agree (#793).
-    static final int MAX_NOTE_LENGTH = 2000;
-
-    private final JourneyItemRepository journeyItemRepository;
-    private final GeschichteQueryService geschichteQueryService;
-    private final DocumentService documentService;
-    private final AuditService auditService;
-    private final UserService userService;
-
-    @Transactional
-    public JourneyItemView append(UUID geschichteId, JourneyItemCreateDTO dto) {
-        Geschichte g = geschichteQueryService.findById(geschichteId)
-                .orElseThrow(() -> DomainException.notFound(ErrorCode.GESCHICHTE_NOT_FOUND,
-                        "Geschichte not found: " + geschichteId));
-
-        long count = journeyItemRepository.countByGeschichteId(geschichteId);
-        if (count >= MAX_ITEMS) {
-            throw DomainException.conflict(ErrorCode.JOURNEY_AT_CAPACITY,
-                    "Journey has reached the maximum of 100 items");
-        }
-
-        String note = normalizeNote(dto.getNote());
-
-        if (dto.getDocumentId() == null && note == null) {
-            throw DomainException.badRequest(ErrorCode.VALIDATION_ERROR,
-                    "At least one of documentId or note must be provided");
-        }
-
-        if (note != null && note.length() > MAX_NOTE_LENGTH) {
-            throw DomainException.badRequest(ErrorCode.JOURNEY_NOTE_TOO_LONG,
-                    "Note exceeds maximum length of " + MAX_NOTE_LENGTH + " characters");
-        }
-
-        Document doc = null;
-        if (dto.getDocumentId() != null) {
-            if (journeyItemRepository.existsByGeschichteIdAndDocumentId(geschichteId, dto.getDocumentId())) {
-                throw DomainException.conflict(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED,
-                        "Document already in journey: " + dto.getDocumentId());
-            }
-            doc = documentService.findSummaryByIdInternal(dto.getDocumentId());
-        }
-
-        int nextPosition = journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)
-                .map(max -> max + POSITION_STEP)
-                .orElse(POSITION_STEP);
-
-        JourneyItem item = JourneyItem.builder()
-                .geschichte(g)
-                .position(nextPosition)
-                .document(doc)
-                .note(note)
-                .build();
-        // saveAndFlush so the partial unique index on (geschichte_id, document_id)
-        // fires here, not at commit — two concurrent appends can both pass the
-        // exists() pre-check above, and the index is the atomic backstop (V74).
-        JourneyItem saved;
-        try {
-            saved = journeyItemRepository.saveAndFlush(item);
-        } catch (DataIntegrityViolationException e) {
-            // Only the dedup index earns the friendly 409 — any other integrity
-            // failure (e.g. an FK violation on a concurrently deleted document)
-            // must not be mislabeled as "already added".
-            if (!isDuplicateDocumentViolation(e)) {
-                throw e;
-            }
-            throw DomainException.conflict(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED,
-                    "Document already in journey: " + dto.getDocumentId());
-        }
-
-        UUID actorId = currentUser().getId();
-        auditService.logAfterCommit(AuditKind.JOURNEY_ITEM_ADDED, actorId, null,
-                Map.of("geschichteId", geschichteId, "itemId", saved.getId()));
-
-        return toView(saved);
-    }
-
-    @Transactional
-    public JourneyItemView updateNote(UUID geschichteId, UUID itemId, JourneyItemUpdateDTO dto) {
-        JourneyItem item = journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)
-                .orElseThrow(() -> DomainException.notFound(ErrorCode.JOURNEY_ITEM_NOT_FOUND,
-                        "Journey item not found: " + itemId));
-
-        // null = field absent from JSON → no-op
-        Optional<String> noteField = dto.getNote();
-        if (noteField == null) {
-            return toView(item);
-        }
-
-        String note = normalizeNote(noteField.orElse(null));
-
-        if (note != null && note.length() > MAX_NOTE_LENGTH) {
-            throw DomainException.badRequest(ErrorCode.JOURNEY_NOTE_TOO_LONG,
-                    "Note exceeds maximum length of " + MAX_NOTE_LENGTH + " characters");
-        }
-
-        if (note == null && item.getDocumentId() == null) {
-            throw DomainException.badRequest(ErrorCode.VALIDATION_ERROR,
-                    "Cannot clear note on an item that has no linked document");
-        }
-
-        item.setNote(note);
-        JourneyItem saved = journeyItemRepository.save(item);
-
-        UUID actorId = currentUser().getId();
-        auditService.logAfterCommit(AuditKind.JOURNEY_ITEM_NOTE_UPDATED, actorId, null,
-                Map.of("geschichteId", geschichteId, "itemId", itemId));
-
-        return toView(saved);
-    }
-
-    @Transactional
-    public void delete(UUID geschichteId, UUID itemId) {
-        JourneyItem item = journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)
-                .orElseThrow(() -> DomainException.notFound(ErrorCode.JOURNEY_ITEM_NOT_FOUND,
-                        "Journey item not found: " + itemId));
-
-        journeyItemRepository.delete(item);
-
-        UUID actorId = currentUser().getId();
-        auditService.logAfterCommit(AuditKind.JOURNEY_ITEM_REMOVED, actorId, null,
-                Map.of("geschichteId", geschichteId, "itemId", itemId));
-    }
-
-    @Transactional
-    public List<JourneyItemView> reorder(UUID geschichteId, JourneyReorderDTO dto) {
-        if (!geschichteQueryService.existsById(geschichteId)) {
-            throw DomainException.notFound(ErrorCode.GESCHICHTE_NOT_FOUND,
-                    "Geschichte not found: " + geschichteId);
-        }
-        Set<UUID> existingIds = journeyItemRepository.findIdsByGeschichteId(geschichteId);
-        List<UUID> requestedIds = dto.getItemIds() != null ? dto.getItemIds() : List.of();
-
-        if (requestedIds.size() != new HashSet<>(requestedIds).size()) {
-            throw DomainException.badRequest(ErrorCode.VALIDATION_ERROR,
-                    "Duplicate item IDs in reorder request");
-        }
-
-        if (!existingIds.equals(new HashSet<>(requestedIds))) {
-            throw DomainException.badRequest(ErrorCode.VALIDATION_ERROR,
-                    "Requested item IDs do not match the journey's existing items");
-        }
-
-        if (requestedIds.isEmpty()) {
-            return List.of();
-        }
-
-        List<JourneyItem> items = journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId);
-        Map<UUID, JourneyItem> itemMap = new HashMap<>();
-        for (JourneyItem item : items) {
-            itemMap.put(item.getId(), item);
-        }
-
-        List<JourneyItem> toSave = new ArrayList<>(requestedIds.size());
-        for (int i = 0; i < requestedIds.size(); i++) {
-            JourneyItem item = itemMap.get(requestedIds.get(i));
-            item.setPosition((i + 1) * POSITION_STEP);
-            toSave.add(item);
-        }
-        List<JourneyItem> reordered = journeyItemRepository.saveAll(toSave);
-
-        UUID actorId = currentUser().getId();
-        auditService.logAfterCommit(AuditKind.JOURNEY_ITEMS_REORDERED, actorId, null,
-                Map.of("geschichteId", geschichteId, "itemCount", reordered.size()));
-
-        return reordered.stream().map(this::toView).toList();
-    }
-
-    public List<JourneyItemView> getItems(UUID geschichteId) {
-        return journeyItemRepository.findByGeschichteIdWithDocument(geschichteId)
-                .stream().map(this::toView).toList();
-    }
-
-    DocumentSummary toSummary(Document doc) {
-        String senderName = buildSenderName(doc);
-        Set<Person> receivers = doc.getReceivers();
-        String receiverName = buildCanonicalReceiverName(receivers);
-
-        return new DocumentSummary(
-                doc.getId(),
-                doc.getTitle(),
-                doc.getDocumentDate(),
-                doc.getMetaDateEnd(),
-                doc.getMetaDatePrecision() != null ? doc.getMetaDatePrecision() : DatePrecision.UNKNOWN,
-                senderName,
-                receiverName,
-                receivers != null ? receivers.size() : 0
-        );
-    }
-
-    JourneyItemView toView(JourneyItem item) {
-        DocumentSummary docSummary = null;
-        Document doc = item.getDocument();
-        if (doc != null) {
-            docSummary = toSummary(doc);
-        }
-        return new JourneyItemView(item.getId(), item.getPosition(), docSummary, item.getNote());
-    }
-
-    private static String buildSenderName(Document doc) {
-        Person sender = doc.getSender();
-        if (sender != null) {
-            String name = PersonNameFormatter.join(sender.getFirstName(), sender.getLastName());
-            if (!name.isBlank()) return name;
-        }
-        String senderText = doc.getSenderText();
-        return (senderText != null && !senderText.isBlank()) ? senderText : null;
-    }
-
-    private static String buildCanonicalReceiverName(Set<Person> receivers) {
-        if (receivers == null || receivers.isEmpty()) return null;
-        return receivers.stream()
-                .min(Comparator.comparing(p -> sortKey(p.getLastName()) + " " + sortKey(p.getFirstName())))
-                .map(p -> {
-                    String name = PersonNameFormatter.join(p.getFirstName(), p.getLastName());
-                    return name.isBlank() ? null : name;
-                })
-                .orElse(null);
-    }
-
-    private static boolean isDuplicateDocumentViolation(DataIntegrityViolationException e) {
-        Throwable cause = e.getCause();
-        if (cause instanceof java.sql.SQLException sql) {
-            return "23505".equals(sql.getSQLState());
-        }
-        return false;
-    }
-
-    private static String normalizeNote(String raw) {
-        if (raw == null || raw.isBlank()) return null;
-        return raw.trim();
-    }
-
-    private static String sortKey(String s) {
-        return s != null ? s : "";
-    }
-
-    private AppUser currentUser() {
-        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth == null || !auth.isAuthenticated()) {
-            throw DomainException.unauthorized("Authentication required");
-        }
-        return userService.findByEmail(auth.getName());
-    }
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemUpdateDTO.java

@@ -1,19 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import lombok.Data;
-
-import java.util.Optional;
-
-/**
- * Input for PATCH /api/geschichten/{id}/items/{itemId}.
- * Three-way semantics via Optional<String>:
- *   null         → field absent from JSON → leave note unchanged
- *   Optional.empty() → {"note": null} → clear the note
- *   Optional.of("x") → {"note": "x"} → set the note
- *
- * Jackson 3.x maps JSON null to Optional.empty(); absent fields keep the Java default (null).
- */
-@Data
-public class JourneyItemUpdateDTO {
-    private Optional<String> note = null;
-}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemView.java

@@ -1,17 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import java.util.UUID;
-
-/**
- * Read-model response for a JourneyItem. Never the JPA entity (which has a
- * Geschichte back-reference that would leak / hit LazyInitializationException).
- */
-public record JourneyItemView(
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) UUID id,
-        @Schema(requiredMode = Schema.RequiredMode.REQUIRED) int position,
-        DocumentSummary document,
-        /** Plain text — not HTML-sanitized. Renderers MUST NOT use {@code @html} or equivalent unsafe output. */
-        String note
-) {}

backend/src/main/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyReorderDTO.java

@@ -1,12 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import lombok.Data;
-
-import java.util.List;
-import java.util.UUID;
-
-/** Input for PUT /api/geschichten/{id}/items/reorder. */
-@Data
-public class JourneyReorderDTO {
-    private List<UUID> itemIds;
-}

backend/src/main/java/org/raddatz/familienarchiv/person/NameMatches.java

@@ -1,13 +0,0 @@
-package org.raddatz.familienarchiv.person;
-
-import java.util.List;
-
-/**
- * Result of {@link PersonService#resolveByName(String)}: candidate persons split by name-match
- * strength. {@code direct} = every query token is a whole-token match across the person's name
- * components (alias/maiden-name aware); {@code partial} = matched the substring fetch but is not
- * direct. The vocabulary is deliberately name-match strength ({@code direct}/{@code partial}), not
- * the search layer's resolved/ambiguous buckets — the caller maps these into its own outcome.
- */
-public record NameMatches(List<Person> direct, List<Person> partial) {
-}

backend/src/main/java/org/raddatz/familienarchiv/person/Person.java

@@ -6,9 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.*;
 import lombok.*;
 
-import org.raddatz.familienarchiv.document.DatePrecision;
 import org.raddatz.familienarchiv.user.DisplayNameFormatter;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -51,25 +49,8 @@ public class Person {
     @Column(columnDefinition = "TEXT")
     private String notes;
 
-    // Most precise birth/death date known. Precision mirrors Document.metaDatePrecision:
-    // the date column is nullable, the precision column is NOT NULL with UNKNOWN meaning
-    // "no date" — the V76 CHECK constraints enforce (date IS NULL) = (precision = UNKNOWN).
-    // DatePrecision is imported cross-domain from document/ by design (ADR-039).
-    private LocalDate birthDate;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "birth_date_precision", nullable = false, length = 16)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    @Builder.Default
-    private DatePrecision birthDatePrecision = DatePrecision.UNKNOWN;
-
-    private LocalDate deathDate;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "death_date_precision", nullable = false, length = 16)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    @Builder.Default
-    private DatePrecision deathDatePrecision = DatePrecision.UNKNOWN;
+    private Integer birthYear;
+    private Integer deathYear;
 
     // Hand-curated generation index from canonical-persons.xlsx (G 0 = oldest).
     // Nullable for persons outside the curated family graph. Drives the

backend/src/main/java/org/raddatz/familienarchiv/person/PersonRepository.java

@@ -19,8 +19,7 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
            "LOWER(CONCAT(COALESCE(p.firstName, ''),' ',p.lastName)) LIKE LOWER(CONCAT('%', :query, '%')) OR " +
            "LOWER(CONCAT(p.lastName, ' ', COALESCE(p.firstName, ''))) LIKE LOWER(CONCAT('%', :query, '%')) OR " +
            "LOWER(p.alias) LIKE LOWER(CONCAT('%', :query, '%')) OR " +
-           "LOWER(a.lastName) LIKE LOWER(CONCAT('%', :query, '%')) OR " +
-           "LOWER(a.firstName) LIKE LOWER(CONCAT('%', :query, '%')) " +
+           "LOWER(a.lastName) LIKE LOWER(CONCAT('%', :query, '%')) " +
            "ORDER BY p.lastName ASC, p.firstName ASC")
     List<Person> searchByName(@Param("query") String query);
 
@@ -30,46 +29,21 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
     // Stammbaum-Knoten: alle Personen mit family_member = true.
     List<Person> findByFamilyMemberTrueOrderByLastNameAscFirstNameAsc();
 
-    // Exact-case alias lookup — the first resolution step in findOrCreateByAlias.
-    // Case-colliding aliases across persons (müller / Müller) are valid human labels, NOT
-    // duplicates: source_ref is the stable identity (ADR-025/033), alias is editable. Do NOT
-    // add a unique(lower(alias)) constraint — see ADR-033.
-    Optional<Person> findByAlias(String alias);
-
-    // Plural case-insensitive alias lookup — the fallback step. Returns ALL case-folding
-    // siblings so the service can pick a deterministic one (lowest id) instead of letting a
-    // derived Optional<…>IgnoreCase throw NonUniqueResultException. See ADR-033.
-    List<Person> findAllByAliasIgnoreCase(String alias);
+    // Lookup by full alias string, used during ODS mass import
+    Optional<Person> findByAliasIgnoreCase(String alias);
 
     // Lookup by the normalizer person_id, used for idempotent canonical re-import (Phase 3).
     Optional<Person> findBySourceRef(String sourceRef);
 
-    // Exact-case first+last name match — the first step of filename-based sender resolution.
-    // Explicit `=` (HQL, not a derived query) so a null firstName binds as `first_name = NULL`
-    // — never a match — instead of the derived-query fold to `first_name IS NULL`, which would
-    // pull a last-name-only row in as a sender (a provenance defect). See ADR-033.
-    @Query("SELECT p FROM Person p WHERE p.firstName = :firstName AND p.lastName = :lastName")
-    Optional<Person> findByFirstNameAndLastName(@Param("firstName") String firstName,
-                                                @Param("lastName") String lastName);
-
-    // Plural case-insensitive first+last name match — lets findByName bail to empty on 2+ matches
-    // instead of letting a derived Optional<…>IgnoreCase throw NonUniqueResultException. Same
-    // null fail-closed guarantee as above: LOWER(:firstName) is NULL for a null arg, so a null
-    // first name resolves to no match (not first_name IS NULL widening). See ADR-033.
-    @Query("SELECT p FROM Person p WHERE LOWER(p.firstName) = LOWER(:firstName) "
-         + "AND LOWER(p.lastName) = LOWER(:lastName)")
-    List<Person> findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase(@Param("firstName") String firstName,
-                                                                   @Param("lastName") String lastName);
+    // Exact first+last name match, used for filename-based sender lookup
+    Optional<Person> findByFirstNameIgnoreCaseAndLastNameIgnoreCase(String firstName, String lastName);
 
     // --- PersonSummaryDTO with document count ---
 
     @Query(value = """
             SELECT p.id, p.title, p.first_name AS firstName, p.last_name AS lastName,
                    p.person_type AS personType,
-                   p.alias, CAST(EXTRACT(YEAR FROM p.birth_date) AS int) AS birthYear,
-                   CAST(EXTRACT(YEAR FROM p.death_date) AS int) AS deathYear,
-                   p.birth_date AS birthDate, p.birth_date_precision AS birthDatePrecision,
-                   p.death_date AS deathDate, p.death_date_precision AS deathDatePrecision, p.notes,
+                   p.alias, p.birth_year AS birthYear, p.death_year AS deathYear, p.notes,
                    p.family_member AS familyMember, p.provisional AS provisional,
                    (SELECT COUNT(*) FROM documents d WHERE d.sender_id = p.id)
                    + (SELECT COUNT(*) FROM document_receivers dr WHERE dr.person_id = p.id) AS documentCount
@@ -82,10 +56,7 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
     @Query(value = """
             SELECT p.id, p.title, p.first_name AS firstName, p.last_name AS lastName,
                    p.person_type AS personType,
-                   p.alias, CAST(EXTRACT(YEAR FROM p.birth_date) AS int) AS birthYear,
-                   CAST(EXTRACT(YEAR FROM p.death_date) AS int) AS deathYear,
-                   p.birth_date AS birthDate, p.birth_date_precision AS birthDatePrecision,
-                   p.death_date AS deathDate, p.death_date_precision AS deathDatePrecision, p.notes,
+                   p.alias, p.birth_year AS birthYear, p.death_year AS deathYear, p.notes,
                    p.family_member AS familyMember, p.provisional AS provisional,
                    (SELECT COUNT(*) FROM documents d WHERE d.sender_id = p.id)
                    + (SELECT COUNT(*) FROM document_receivers dr WHERE dr.person_id = p.id) AS documentCount
@@ -95,7 +66,7 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
                OR LOWER(CONCAT(p.last_name,' ',COALESCE(p.first_name,''))) LIKE LOWER(CONCAT('%',:query,'%'))
                OR LOWER(p.alias) LIKE LOWER(CONCAT('%',:query,'%'))
                OR LOWER(a.last_name) LIKE LOWER(CONCAT('%',:query,'%'))
-            GROUP BY p.id, p.title, p.first_name, p.last_name, p.person_type, p.alias, p.birth_date, p.birth_date_precision, p.death_date, p.death_date_precision, p.notes, p.family_member, p.provisional
+            GROUP BY p.id, p.title, p.first_name, p.last_name, p.person_type, p.alias, p.birth_year, p.death_year, p.notes, p.family_member, p.provisional
             ORDER BY p.last_name ASC, p.first_name ASC
             """,
             nativeQuery = true)
@@ -106,10 +77,7 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
     @Query(value = """
             SELECT p.id, p.title, p.first_name AS firstName, p.last_name AS lastName,
                    p.person_type AS personType,
-                   p.alias, CAST(EXTRACT(YEAR FROM p.birth_date) AS int) AS birthYear,
-                   CAST(EXTRACT(YEAR FROM p.death_date) AS int) AS deathYear,
-                   p.birth_date AS birthDate, p.birth_date_precision AS birthDatePrecision,
-                   p.death_date AS deathDate, p.death_date_precision AS deathDatePrecision, p.notes,
+                   p.alias, p.birth_year AS birthYear, p.death_year AS deathYear, p.notes,
                    p.family_member AS familyMember, p.provisional AS provisional,
                    (SELECT COUNT(*) FROM documents d WHERE d.sender_id = p.id)
                    + (SELECT COUNT(*) FROM document_receivers dr WHERE dr.person_id = p.id) AS documentCount
@@ -148,10 +116,7 @@ public interface PersonRepository extends JpaRepository<Person, UUID> {
     @Query(value = """
             SELECT p.id, p.title, p.first_name AS firstName, p.last_name AS lastName,
                    p.person_type AS personType,
-                   p.alias, CAST(EXTRACT(YEAR FROM p.birth_date) AS int) AS birthYear,
-                   CAST(EXTRACT(YEAR FROM p.death_date) AS int) AS deathYear,
-                   p.birth_date AS birthDate, p.birth_date_precision AS birthDatePrecision,
-                   p.death_date AS deathDate, p.death_date_precision AS deathDatePrecision, p.notes,
+                   p.alias, p.birth_year AS birthYear, p.death_year AS deathYear, p.notes,
                    p.family_member AS familyMember, p.provisional AS provisional,
                    (SELECT COUNT(*) FROM documents d WHERE d.sender_id = p.id)
                    + (SELECT COUNT(*) FROM document_receivers dr WHERE dr.person_id = p.id) AS documentCount

backend/src/main/java/org/raddatz/familienarchiv/person/PersonService.java

@@ -1,23 +1,14 @@
 package org.raddatz.familienarchiv.person;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
-import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 import org.springframework.lang.Nullable;
 
 import org.raddatz.familienarchiv.person.PersonNameAliasDTO;
 import org.raddatz.familienarchiv.person.PersonSummaryDTO;
 import org.raddatz.familienarchiv.person.PersonUpdateDTO;
-import org.raddatz.familienarchiv.document.DatePrecision;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.person.Person;
@@ -32,20 +23,11 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.server.ResponseStatusException;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 
 @Service
 @RequiredArgsConstructor
-@Slf4j
 public class PersonService {
 
-    // Co-located with the fetch loop that owns them (issue #763). MAX_TOKENS caps the number of
-    // unindexed leading-wildcard LIKE scans per name — a DoS control, not just perf. MAX_CANDIDATES
-    // bounds each result bucket and is applied AFTER classification so a direct match that sorts
-    // past position 10 among partials is never discarded.
-    private static final int MAX_TOKENS = 8;
-    private static final int MAX_CANDIDATES = 10;
-
     private final PersonRepository personRepository;
     private final PersonNameAliasRepository aliasRepository;
 
@@ -116,96 +98,6 @@ public class PersonService {
         return personRepository.findAllById(ids);
     }
 
-    public List<Person> findByDisplayNameContaining(String fragment) {
-        return personRepository.searchByName(fragment);
-    }
-
-    // Name-match tokenizer (issue #763): lowercase, split on whitespace/hyphen/apostrophe,
-    // drop empties. Applied symmetrically to the query and to every candidate name component so
-    // that "Anna-Maria" and "Anna Maria" tokenize alike. Order-preserving for deterministic tests.
-    static Set<String> tokenize(String raw) {
-        if (raw == null || raw.isBlank()) {
-            return Set.of();
-        }
-        LinkedHashSet<String> tokens = new LinkedHashSet<>();
-        for (String part : raw.toLowerCase(Locale.ROOT).split("[\\s\\-']+")) {
-            if (!part.isEmpty()) {
-                tokens.add(part);
-            }
-        }
-        return tokens;
-    }
-
-    /**
-     * Resolves an extracted person name into {@link NameMatches} by name-match strength.
-     * Orchestrates tokenize → cap → fetch pool → classify → cap-after-classify. Read-only
-     * transaction keeps the Hibernate session open so each candidate's lazy {@code nameAliases}
-     * are reachable during classification (see ADR-022).
-     */
-    @Transactional(readOnly = true)
-    public NameMatches resolveByName(String name) {
-        Set<String> queryTokens = capTokens(tokenize(name));
-        if (queryTokens.isEmpty()) {
-            log.debug("resolveByName outcome=no-match tokens=0");
-            return new NameMatches(List.of(), List.of());
-        }
-        return classify(fetchPool(queryTokens), queryTokens);
-    }
-
-    private Set<String> capTokens(Set<String> tokens) {
-        return tokens.stream().limit(MAX_TOKENS).collect(Collectors.toCollection(LinkedHashSet::new));
-    }
-
-    private List<Person> fetchPool(Set<String> queryTokens) {
-        LinkedHashMap<UUID, Person> pool = new LinkedHashMap<>();
-        for (String token : queryTokens) {
-            for (Person candidate : findByDisplayNameContaining(token)) {
-                pool.putIfAbsent(candidate.getId(), candidate);
-            }
-        }
-        return new ArrayList<>(pool.values());
-    }
-
-    private NameMatches classify(List<Person> pool, Set<String> queryTokens) {
-        List<Person> direct = new ArrayList<>();
-        List<Person> partial = new ArrayList<>();
-        for (Person candidate : pool) {
-            if (personTokens(candidate).containsAll(queryTokens)) {
-                direct.add(candidate);
-            } else {
-                partial.add(candidate);
-            }
-        }
-        List<Person> cappedDirect = cap(direct);
-        List<Person> cappedPartial = cap(partial);
-        log.debug("resolveByName outcome={} tokens={}", outcome(cappedDirect, cappedPartial), queryTokens.size());
-        return new NameMatches(cappedDirect, cappedPartial);
-    }
-
-    private static Set<String> personTokens(Person person) {
-        Set<String> tokens = new LinkedHashSet<>();
-        tokens.addAll(tokenize(person.getFirstName()));
-        tokens.addAll(tokenize(person.getLastName()));
-        tokens.addAll(tokenize(person.getAlias()));
-        tokens.addAll(tokenize(person.getTitle()));
-        for (PersonNameAlias alias : person.getNameAliases()) {
-            tokens.addAll(tokenize(alias.getFirstName()));
-            tokens.addAll(tokenize(alias.getLastName()));
-        }
-        return tokens;
-    }
-
-    private static List<Person> cap(List<Person> people) {
-        return people.size() > MAX_CANDIDATES ? people.subList(0, MAX_CANDIDATES) : people;
-    }
-
-    private static String outcome(List<Person> direct, List<Person> partial) {
-        if (direct.size() == 1) return "direct=1";
-        if (direct.size() >= 2) return "direct>=2";
-        if (!partial.isEmpty()) return "partial-only";
-        return "no-match";
-    }
-
     public List<Person> findAllFamilyMembers() {
         return personRepository.findByFamilyMemberTrueOrderByLastNameAscFirstNameAsc();
     }
@@ -218,19 +110,7 @@ public class PersonService {
     }
 
     public Optional<Person> findByName(String firstName, String lastName) {
-        // Same scope as findOrCreateByAlias (#731): a case-collision resolves without throwing;
-        // two byte-identical same-case persons are an out-of-scope data anomaly the exact
-        // Optional below would surface as the opaque INTERNAL_ERROR, not a wrong sender.
-        Optional<Person> exact = personRepository.findByFirstNameAndLastName(firstName, lastName);
-        if (exact.isPresent()) return exact;
-        List<Person> caseInsensitive =
-                personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase(firstName, lastName);
-        // Deliberate divergence from findOrCreateByAlias: an ambiguous filename leaves the sender
-        // UNSET rather than picking the lowest id. The archive's value is correct provenance — a
-        // confidently-wrong pre-filled "Hans Müller" is worse than an empty field, because a
-        // reviewer won't re-check a pre-filled value. Do NOT "consistency-clean" this into the
-        // lowest-id fallback. See ADR-033.
-        return caseInsensitive.size() == 1 ? Optional.of(caseInsensitive.get(0)) : Optional.empty();
+        return personRepository.findByFirstNameIgnoreCaseAndLastNameIgnoreCase(firstName, lastName);
     }
 
     /** Lookup by the normalizer person_id — used by the canonical importer for register-first matching. */
@@ -245,45 +125,32 @@ public class PersonService {
         PersonType type = PersonTypeClassifier.classify(alias);
         if (type == PersonType.SKIP) return null;
 
-        // Aliases differing only by case (müller / Müller) are valid distinct persons, not
-        // duplicates, so a CASE-COLLISION must not throw: exact-case first, then the lowest-id
-        // case-insensitive sibling, then create. Mirrors the tag path — see ADR-033.
-        // Scope (#731): "ambiguous" means case-insensitive. Two BYTE-IDENTICAL same-case aliases
-        // are a true data anomaly out of scope here; the exact Optional below would surface that
-        // as the opaque INTERNAL_ERROR (never a wrong row), not silently pick one.
-        Optional<Person> exact = personRepository.findByAlias(alias);
-        if (exact.isPresent()) return exact.get();              // exact-case wins
-        List<Person> caseInsensitive = personRepository.findAllByAliasIgnoreCase(alias);
-        if (!caseInsensitive.isEmpty()) {
-            return caseInsensitive.stream().min(Comparator.comparing(Person::getId)).orElseThrow(); // deterministic tie-break — list is non-empty, never throws
-        }
+        return personRepository.findByAliasIgnoreCase(alias).orElseGet(() -> {
+            if (type == PersonType.INSTITUTION || type == PersonType.GROUP) {
+                return personRepository.save(Person.builder()
+                        .alias(alias)
+                        .lastName(alias)
+                        .personType(type)
+                        .build());
+            }
 
-        // Create-when-absent: institution/group keep the full label in lastName; a person name
-        // is split and a maiden name (geb. …) becomes a MAIDEN_NAME alias.
-        if (type == PersonType.INSTITUTION || type == PersonType.GROUP) {
-            return personRepository.save(Person.builder()
+            PersonNameParser.SplitName split = PersonNameParser.split(alias);
+            Person person = personRepository.save(Person.builder()
                     .alias(alias)
-                    .lastName(alias)
-                    .personType(type)
+                    .firstName(split.firstName())
+                    .lastName(split.lastName())
                     .build());
-        }
-
-        PersonNameParser.SplitName split = PersonNameParser.split(alias);
-        Person person = personRepository.save(Person.builder()
-                .alias(alias)
-                .firstName(split.firstName())
-                .lastName(split.lastName())
-                .build());
-        if (split.maidenName() != null) {
-            int nextSortOrder = aliasRepository.findMaxSortOrder(person.getId()) + 1;
-            aliasRepository.save(PersonNameAlias.builder()
-                    .person(person)
-                    .lastName(split.maidenName())
-                    .type(PersonNameAliasType.MAIDEN_NAME)
-                    .sortOrder(nextSortOrder)
-                    .build());
-        }
-        return person;
+            if (split.maidenName() != null) {
+                int nextSortOrder = aliasRepository.findMaxSortOrder(person.getId()) + 1;
+                aliasRepository.save(PersonNameAlias.builder()
+                        .person(person)
+                        .lastName(split.maidenName())
+                        .type(PersonNameAliasType.MAIDEN_NAME)
+                        .sortOrder(nextSortOrder)
+                        .build());
+            }
+            return person;
+        });
     }
 
     /**
@@ -301,20 +168,13 @@ public class PersonService {
     }
 
     private Person fromCanonical(PersonUpsertCommand cmd) {
-        DatePrecisionPair none = new DatePrecisionPair(null, DatePrecision.UNKNOWN);
-        LifeDates dates = degradeIfConflicting(
-                yearPair(cmd.birthYear()), yearPair(cmd.deathYear()), none, none, cmd.sourceRef());
-        DatePrecisionPair birth = dates.birth();
-        DatePrecisionPair death = dates.death();
         Person person = personRepository.save(Person.builder()
                 .sourceRef(cmd.sourceRef())
                 .firstName(blankToNull(cmd.firstName()))
                 .lastName(cmd.lastName())
                 .notes(blankToNull(cmd.notes()))
-                .birthDate(birth.date())
-                .birthDatePrecision(birth.precision())
-                .deathDate(death.date())
-                .deathDatePrecision(death.precision())
+                .birthYear(cmd.birthYear())
+                .deathYear(cmd.deathYear())
                 .generation(cmd.generation())
                 .familyMember(cmd.familyMember())
                 .personType(cmd.personType() == null ? PersonType.PERSON : cmd.personType())
@@ -337,16 +197,8 @@ public class PersonService {
         existing.setFirstName(preferHuman(existing.getFirstName(), cmd.firstName()));
         existing.setLastName(preferHuman(existing.getLastName(), cmd.lastName()));
         existing.setNotes(preferHuman(existing.getNotes(), cmd.notes()));
-        LifeDates dates = degradeIfConflicting(
-                preferHumanDate(existing.getBirthDate(), existing.getBirthDatePrecision(), cmd.birthYear()),
-                preferHumanDate(existing.getDeathDate(), existing.getDeathDatePrecision(), cmd.deathYear()),
-                new DatePrecisionPair(existing.getBirthDate(), existing.getBirthDatePrecision()),
-                new DatePrecisionPair(existing.getDeathDate(), existing.getDeathDatePrecision()),
-                cmd.sourceRef());
-        existing.setBirthDate(dates.birth().date());
-        existing.setBirthDatePrecision(dates.birth().precision());
-        existing.setDeathDate(dates.death().date());
-        existing.setDeathDatePrecision(dates.death().precision());
+        existing.setBirthYear(preferHuman(existing.getBirthYear(), cmd.birthYear()));
+        existing.setDeathYear(preferHuman(existing.getDeathYear(), cmd.deathYear()));
         existing.setGeneration(preferHuman(existing.getGeneration(), cmd.generation()));
         if (cmd.personType() != null && existing.getPersonType() == PersonType.PERSON) {
             existing.setPersonType(cmd.personType());
@@ -373,48 +225,6 @@ public class PersonService {
         return existing != null ? existing : canonical;
     }
 
-    // Date + precision travel as one value so they can never go out of sync (ADR-039).
-    record DatePrecisionPair(LocalDate date, DatePrecision precision) {}
-
-    record LifeDates(DatePrecisionPair birth, DatePrecisionPair death) {}
-
-    // The canonical path skips validateLifeDates (the form-only guard), so a conflicting
-    // resolved pair would hit chk_person_birth_before_death at flush time and abort the
-    // whole import batch with a raw 500. Degrade instead (REQ-IMP-001: never abort the
-    // batch): keep the person's stored life dates — empty for a new person — and drop the
-    // conflicting canonical refresh. A hand-entered side is preserved by construction,
-    // since preferHumanDate returned it verbatim and it equals the stored value; two
-    // stored values can never conflict with each other (they already satisfied the CHECK).
-    static LifeDates degradeIfConflicting(DatePrecisionPair birth, DatePrecisionPair death,
-                                          DatePrecisionPair existingBirth, DatePrecisionPair existingDeath,
-                                          String sourceRef) {
-        if (birth.date() == null || death.date() == null || !birth.date().isAfter(death.date())) {
-            return new LifeDates(birth, death);
-        }
-        log.warn("Conflicting canonical life dates for {}: birth {} is after death {} — keeping stored values",
-                sourceRef, birth.date(), death.date());
-        return new LifeDates(existingBirth, existingDeath);
-    }
-
-    // preferHuman for life dates (ADR-025 extension): a hand-entered date more precise than
-    // the spreadsheet's year (DAY/MONTH/SEASON/RANGE/APPROX) is preserved on re-import; a
-    // YEAR-precision or absent date is refreshed from the canonical year.
-    static DatePrecisionPair preferHumanDate(LocalDate existingDate, DatePrecision existingPrecision,
-                                             Integer canonicalYear) {
-        boolean handEntered = existingDate != null && existingPrecision != null
-                && existingPrecision != DatePrecision.YEAR && existingPrecision != DatePrecision.UNKNOWN;
-        if (handEntered) {
-            return new DatePrecisionPair(existingDate, existingPrecision);
-        }
-        return yearPair(canonicalYear);
-    }
-
-    private static DatePrecisionPair yearPair(Integer year) {
-        return year != null
-                ? new DatePrecisionPair(LocalDate.of(year, 1, 1), DatePrecision.YEAR)
-                : new DatePrecisionPair(null, DatePrecision.UNKNOWN);
-    }
-
     private static String blankToNull(String s) {
         return (s == null || s.isBlank()) ? null : s.trim();
     }
@@ -434,8 +244,7 @@ public class PersonService {
         if (dto.getPersonType() == PersonType.SKIP) {
             throw DomainException.badRequest(ErrorCode.INVALID_PERSON_TYPE, "SKIP is not a valid person type for manual creation");
         }
-        validateLifeDates(dto.getBirthDate(), dto.getBirthDatePrecision(),
-                dto.getDeathDate(), dto.getDeathDatePrecision());
+        validateYears(dto.getBirthYear(), dto.getDeathYear());
         Person person = Person.builder()
                 .personType(dto.getPersonType())
                 .title(dto.getTitle() == null || dto.getTitle().isBlank() ? null : dto.getTitle().trim())
@@ -443,49 +252,31 @@ public class PersonService {
                 .lastName(dto.getLastName())
                 .alias(dto.getAlias() == null || dto.getAlias().isBlank() ? null : dto.getAlias().trim())
                 .notes(dto.getNotes() == null || dto.getNotes().isBlank() ? null : dto.getNotes().trim())
-                .birthDate(dto.getBirthDate())
-                .birthDatePrecision(normalizePrecision(dto.getBirthDatePrecision()))
-                .deathDate(dto.getDeathDate())
-                .deathDatePrecision(normalizePrecision(dto.getDeathDatePrecision()))
+                .birthYear(dto.getBirthYear())
+                .deathYear(dto.getDeathYear())
                 .generation(dto.getGeneration())
                 .build();
         return personRepository.save(person);
     }
 
-    // Cross-field invariants the V76 CHECK constraints also enforce — validated here so the
-    // user gets a structured ErrorCode instead of a raw constraint-violation 500.
-    private void validateLifeDates(LocalDate birthDate, DatePrecision birthPrecision,
-                                   LocalDate deathDate, DatePrecision deathPrecision) {
-        requireDatePrecisionCoherence(birthDate, birthPrecision, "birth");
-        requireDatePrecisionCoherence(deathDate, deathPrecision, "death");
-        if (birthDate != null && deathDate != null && birthDate.isAfter(deathDate)) {
-            throw DomainException.badRequest(ErrorCode.BIRTH_AFTER_DEATH,
-                    "Birth date " + birthDate + " is after death date " + deathDate);
+    private void validateYears(Integer birthYear, Integer deathYear) {
+        if (birthYear != null && birthYear <= 0) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Geburtsjahr muss eine positive Zahl sein");
         }
-    }
-
-    private static void requireDatePrecisionCoherence(LocalDate date, DatePrecision precision, String side) {
-        if (date != null && (precision == null || precision == DatePrecision.UNKNOWN)) {
-            throw DomainException.badRequest(ErrorCode.INVALID_DATE_PRECISION,
-                    side + " date is set but its precision is missing or UNKNOWN");
+        if (deathYear != null && deathYear <= 0) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Todesjahr muss eine positive Zahl sein");
         }
-        if (date == null && precision != null && precision != DatePrecision.UNKNOWN) {
-            throw DomainException.badRequest(ErrorCode.INVALID_DATE_PRECISION,
-                    side + " date precision " + precision + " is set without a date");
+        if (birthYear != null && deathYear != null && birthYear > deathYear) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Geburtsjahr darf nicht nach dem Todesjahr liegen");
         }
     }
 
-    private static DatePrecision normalizePrecision(DatePrecision precision) {
-        return precision == null ? DatePrecision.UNKNOWN : precision;
-    }
-
     @Transactional
     public Person updatePerson(UUID id, PersonUpdateDTO dto) {
         if (dto.getPersonType() == PersonType.SKIP) {
             throw DomainException.badRequest(ErrorCode.INVALID_PERSON_TYPE, "SKIP is not a valid person type for manual editing");
         }
-        validateLifeDates(dto.getBirthDate(), dto.getBirthDatePrecision(),
-                dto.getDeathDate(), dto.getDeathDatePrecision());
+        validateYears(dto.getBirthYear(), dto.getDeathYear());
         Person person = personRepository.findById(id)
                 .orElseThrow(() -> DomainException.notFound(ErrorCode.PERSON_NOT_FOUND, "Person not found: " + id));
         person.setPersonType(dto.getPersonType());
@@ -494,10 +285,8 @@ public class PersonService {
         person.setLastName(dto.getLastName());
         person.setAlias(dto.getAlias() == null || dto.getAlias().isBlank() ? null : dto.getAlias().trim());
         person.setNotes(dto.getNotes() == null || dto.getNotes().isBlank() ? null : dto.getNotes().trim());
-        person.setBirthDate(dto.getBirthDate());
-        person.setBirthDatePrecision(normalizePrecision(dto.getBirthDatePrecision()));
-        person.setDeathDate(dto.getDeathDate());
-        person.setDeathDatePrecision(normalizePrecision(dto.getDeathDatePrecision()));
+        person.setBirthYear(dto.getBirthYear());
+        person.setDeathYear(dto.getDeathYear());
         // Form path: a human can clear generation back to null. Unlike the importer
         // which routes through preferHuman, we write the DTO value verbatim.
         person.setGeneration(dto.getGeneration());

backend/src/main/java/org/raddatz/familienarchiv/person/PersonSummaryDTO.java

@@ -1,8 +1,5 @@
 package org.raddatz.familienarchiv.person;
 
-import org.raddatz.familienarchiv.document.DatePrecision;
-
-import java.time.LocalDate;
 import java.util.UUID;
 
 /**
@@ -19,13 +16,6 @@ public interface PersonSummaryDTO {
     String getAlias();
     Integer getBirthYear();
     Integer getDeathYear();
-    // Full date + precision alongside the derived years: list consumers that render
-    // precise life dates (mention dropdown) read these; year-only consumers keep
-    // the cheaper getBirthYear/getDeathYear.
-    LocalDate getBirthDate();
-    DatePrecision getBirthDatePrecision();
-    LocalDate getDeathDate();
-    DatePrecision getDeathDatePrecision();
     String getNotes();
     boolean isFamilyMember();
     boolean isProvisional();

backend/src/main/java/org/raddatz/familienarchiv/person/PersonUpdateDTO.java

@@ -5,11 +5,8 @@ import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
-import org.raddatz.familienarchiv.document.DatePrecision;
 import org.raddatz.familienarchiv.person.PersonType;
 
-import java.time.LocalDate;
-
 @Data
 public class PersonUpdateDTO {
     @NotNull
@@ -24,10 +21,8 @@ public class PersonUpdateDTO {
     private String alias;
     @Size(max = 5000)
     private String notes;
-    private LocalDate birthDate;
-    private DatePrecision birthDatePrecision;
-    private LocalDate deathDate;
-    private DatePrecision deathDatePrecision;
+    private Integer birthYear;
+    private Integer deathYear;
     // Mirror of the persons.generation CHECK constraint (V70). Bounds live in
     // PersonGeneration so DB, DTO, and importer all read from one place.
     @Min(PersonGeneration.MIN_GENERATION)

backend/src/main/java/org/raddatz/familienarchiv/person/README.md

@@ -20,9 +20,8 @@ Features: person CRUD, name alias management, person merge (deduplication), fami
 | `getById(UUID)` | document, geschichte, ocr | Fetch one person by ID |
 | `getAllById(List<UUID>)` | document | Bulk fetch for sender/receiver resolution |
 | `findAll(String q)` | document, dashboard | List all persons |
-| `findByName(String firstName, String lastName)` | document | Filename-based **sender resolution** in `storeDocument`: exact-case match → single case-insensitive match → else **empty** (ambiguous names leave the sender unset; a null first name never matches). See ADR-033. |
-| `resolveByName(String name)` | search | NL-search name resolution returning `NameMatches` (direct vs partial). Token/word-boundary, alias-aware matching so a single direct match auto-selects even when looser substring hits coexist ("Clara Cram" vs "Clara Cramer"). See #763. |
-| `findOrCreateByAlias(String rawName)` | importing | Idempotent create during mass import; type classification happens internally. Resolves exact-case → lowest-id case-insensitive sibling → create — never throws on case-colliding aliases. See ADR-033. |
+| `findByName(String firstName, String lastName)` | document | Typeahead search |
+| `findOrCreateByAlias(String rawName)` | importing | Idempotent create during mass import; type classification happens internally |
 | `findAllFamilyMembers()` | dashboard | Family member list for stats |
 | `findCorrespondents()` | document | Correspondent list for conversation filter |
 | `count()` | dashboard | Total person count for stats |

backend/src/main/java/org/raddatz/familienarchiv/person/relationship/RelationshipInferenceService.java

@@ -96,9 +96,7 @@ public class RelationshipInferenceService {
             if (p == null) continue;
             List<RelationToken> path = shortestPaths.get(id);
             PersonNodeDTO node = new PersonNodeDTO(
-                    p.getId(), p.getDisplayName(),
-                    RelationshipService.yearOf(p.getBirthDate()),
-                    RelationshipService.yearOf(p.getDeathDate()),
+                    p.getId(), p.getDisplayName(), p.getBirthYear(), p.getDeathYear(),
                     p.getGeneration(), p.isFamilyMember());
             out.add(new InferredRelationshipWithPersonDTO(node, labelFor(path), path.size()));
         }

backend/src/main/java/org/raddatz/familienarchiv/person/relationship/RelationshipService.java

@@ -15,7 +15,6 @@ import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -67,8 +66,7 @@ public class RelationshipService {
         for (Person p : familyMembers) {
             familyIds.add(p.getId());
             nodes.add(new PersonNodeDTO(
-                    p.getId(), p.getDisplayName(),
-                    yearOf(p.getBirthDate()), yearOf(p.getDeathDate()),
+                    p.getId(), p.getDisplayName(), p.getBirthYear(), p.getDeathYear(),
                     p.getGeneration(), true));
         }
 
@@ -157,13 +155,6 @@ public class RelationshipService {
         return (s == null || s.isBlank()) ? null : s.trim();
     }
 
-    // Stammbaum DTOs stay year-shaped: derive the year from the LocalDate, null-safe
-    // for persons with no date entered (ADR-039, REQ-PERSON-DATE-01). Package-private
-    // so RelationshipInferenceService shares the same derivation.
-    static Integer yearOf(LocalDate date) {
-        return date != null ? date.getYear() : null;
-    }
-
     private static void validateYears(Integer fromYear, Integer toYear) {
         if (fromYear != null && toYear != null && toYear < fromYear) {
             throw DomainException.badRequest(
@@ -179,11 +170,11 @@ public class RelationshipService {
                 p.getId(),
                 rp.getId(),
                 p.getDisplayName(),
-                yearOf(p.getBirthDate()),
-                yearOf(p.getDeathDate()),
+                p.getBirthYear(),
+                p.getDeathYear(),
                 rp.getDisplayName(),
-                yearOf(rp.getBirthDate()),
-                yearOf(rp.getDeathDate()),
+                rp.getBirthYear(),
+                rp.getDeathYear(),
                 r.getRelationType(),
                 r.getFromYear(),
                 r.getToYear(),

backend/src/main/java/org/raddatz/familienarchiv/tag/TagService.java

@@ -46,10 +46,6 @@ public class TagService {
         return enrichWithRelatives(matched);
     }
 
-    public List<Tag> findByNameContaining(String fragment) {
-        return tagRepository.findByNameContainingIgnoreCase(fragment);
-    }
-
     public Tag getById(UUID id) {
         return tagRepository.findById(id)
                 .orElseThrow(() -> DomainException.notFound(ErrorCode.TAG_NOT_FOUND, "Tag not found: " + id));

backend/src/main/java/org/raddatz/familienarchiv/timeline/EventType.java

@@ -1,17 +0,0 @@
-package org.raddatz.familienarchiv.timeline;
-
-/**
- * Kind of a curated {@link TimelineEvent}.
- *
- * <p>The string value names are a <strong>stable frontend styling contract</strong>: the
- * Svelte timeline components hard-code {@code "PERSONAL"} (family accent) and
- * {@code "HISTORICAL"} (muted world accent) as Tailwind class-map keys. There is no
- * mapping layer — renaming either value requires a coordinated frontend change. See
- * ADR-040.
- */
-public enum EventType {
-    /** A family/personal event (birth, wedding, move) — rendered with the family accent. */
-    PERSONAL,
-    /** A world/historical event providing context — rendered with the muted world accent. */
-    HISTORICAL
-}

backend/src/main/java/org/raddatz/familienarchiv/timeline/TimelineEvent.java

@@ -1,134 +0,0 @@
-package org.raddatz.familienarchiv.timeline;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import org.raddatz.familienarchiv.document.DatePrecision;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.person.Person;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * A curated event on the family timeline (Zeitstrahl). Unlike a {@link Document}, which is
- * OCR-derived, a {@code TimelineEvent} is authored by curators — hence the optimistic-lock
- * {@link #version} and the {@link #createdBy}/{@link #updatedBy} audit trail that
- * {@code Document} lacks.
- *
- * <p>The date block ({@link #eventDate}, {@link #precision}, {@link #eventDateEnd}) mirrors
- * {@code Document}'s so events and letters share one rendering path. The mirror applies to
- * the date block only — the audit footprint deliberately diverges (see ADR-040).
- */
-@Entity
-@Table(name = "timeline_events")
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class TimelineEvent {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private UUID id;
-
-    @Column(nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private String title;
-
-    @Enumerated(EnumType.STRING)
-    @Column(nullable = false, length = 16)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private EventType type;
-
-    /** The most precise date known for the event. Always present — a curated event is never undated. */
-    @Column(name = "event_date", nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDate eventDate;
-
-    /**
-     * Precision of {@link #eventDate}. Reuses {@code document.DatePrecision} (one rendering
-     * path; see ADR-025 / ADR-040). Every value except {@code UNKNOWN} is legal for a curated
-     * event — including {@code SEASON} ("Sommer 1914") and {@code APPROX} ("ca. 1914"). The DB
-     * CHECK forbids exactly {@code UNKNOWN}; do not narrow it further.
-     */
-    @Enumerated(EnumType.STRING)
-    @Column(name = "date_precision", nullable = false, length = 16)
-    @Builder.Default
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private DatePrecision precision = DatePrecision.YEAR;
-
-    /** Range end — non-null <strong>iff</strong> {@link #precision} is {@code RANGE} (DB CHECK, both directions). */
-    @Column(name = "event_date_end")
-    private LocalDate eventDateEnd;
-
-    @Column(columnDefinition = "TEXT")
-    private String description;
-
-    /** People the event involves. */
-    @ManyToMany(fetch = FetchType.LAZY)
-    @JoinTable(name = "timeline_event_persons",
-            joinColumns = @JoinColumn(name = "timeline_event_id"),
-            inverseJoinColumns = @JoinColumn(name = "person_id"))
-    @BatchSize(size = 50)
-    @Builder.Default
-    private Set<Person> persons = new HashSet<>();
-
-    /** Optional supporting letters linked to the event. */
-    @ManyToMany(fetch = FetchType.LAZY)
-    @JoinTable(name = "timeline_event_documents",
-            joinColumns = @JoinColumn(name = "timeline_event_id"),
-            inverseJoinColumns = @JoinColumn(name = "document_id"))
-    @BatchSize(size = 50)
-    @Builder.Default
-    private Set<Document> documents = new HashSet<>();
-
-    /**
-     * UUID of the {@code AppUser} who created the event. Bare UUID, no FK to {@code app_users}
-     * (sidecar pattern — keeps {@code timeline} decoupled from {@code user}). Server-populated
-     * from the session principal; never accepted from client input (authorship-forgery vector,
-     * CWE-639 — see ADR-040).
-     */
-    @Column(name = "created_by", nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private UUID createdBy;
-
-    @CreationTimestamp
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime createdAt;
-
-    /**
-     * UUID of the {@code AppUser} who last edited the event. Populated from the session
-     * principal in {@code TimelineEventService}; <strong>must be set before every
-     * {@code save()}</strong> — {@code @UpdateTimestamp} on {@link #updatedAt} does NOT set this
-     * automatically, so without an explicit set the timestamp advances while the "who" goes
-     * stale. Same forgery rationale as {@link #createdBy}.
-     */
-    @Column(name = "updated_by", nullable = false)
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private UUID updatedBy;
-
-    @UpdateTimestamp
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private LocalDateTime updatedAt;
-
-    /**
-     * Optimistic-lock version for the multi-curator edit flow (#775). Object {@code Long}
-     * (not primitive) so it is {@code null} before first persist; Hibernate sets {@code 0} on
-     * insert. A concurrent-write conflict must be translated to {@code DomainException.conflict}
-     * in the service layer (ADR-040) — otherwise it surfaces as HTTP 500 with Hibernate
-     * internals (CWE-209).
-     */
-    @Version
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED)
-    private Long version;
-}

backend/src/main/java/org/raddatz/familienarchiv/timeline/TimelineEventRepository.java

@@ -1,9 +0,0 @@
-package org.raddatz.familienarchiv.timeline;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.UUID;
-
-public interface TimelineEventRepository extends JpaRepository<TimelineEvent, UUID> {
-    // TODO(#777): findByPersonsContaining(Person) needed for the per-person filter
-}

backend/src/main/resources/application-dev.yaml

@@ -11,4 +11,3 @@ springdoc:
   swagger-ui:
     enabled: true
     path: /swagger-ui.html
-

backend/src/main/resources/db/migration/V72__add_journey_items_migrate_geschichten_documents.sql

@@ -1,73 +0,0 @@
--- Production pre-requisite — run BEFORE applying this migration:
---   docker exec familienarchiv-db sh -c 'psql -U "$POSTGRES_USER" -d "$POSTGRES_DB" \
---     -c "SELECT COUNT(DISTINCT (geschichte_id, document_id)) FROM geschichten_documents;"'
---   docker exec familienarchiv-db sh -c 'pg_dump -U "$POSTGRES_USER" "$POSTGRES_DB" \
---     --table=geschichten_documents \
---     -f /tmp/pre_v72_backup_'"$(date +%Y%m%d)"'.sql'
--- Take the dump even if geschichten_documents is empty — it captures the table DEFINITION
--- for emergency reconstruction. The DROP TABLE is the only irreversible step; the
--- INSERT...SELECT is a no-op when there is no data. No DDL rollback path exists after commit.
---
--- REVERSE PROCEDURE (if V72 must be rolled back): restore the pre-V72 dump, then re-derive
--- the junction from the new table:
---   INSERT INTO geschichten_documents (geschichte_id, document_id)
---     SELECT geschichte_id, document_id FROM journey_items WHERE document_id IS NOT NULL;
--- Note: the reconstructed junction FK is ON DELETE CASCADE per the original V58
--- (NOT the new SET NULL of journey_items). Domain FKs target app_users (post-V60) —
--- do NOT hand-type V58's verbatim "REFERENCES users" DDL nor copy journey_items' SET NULL
--- into the reconstructed junction.
---
--- ASSUMPTION AS-001: The old geschichten_documents was an unordered Set — no curator order
--- existed. Ordering by meta_date is a plausible default a Lesereise lets curators
--- re-sequence. This is not a requirement; it is the best available approximation.
---
--- ASSUMPTION AS-002: Existing published Geschichten (STORYs) render the related-letters block;
--- this block visibly degrades to generic links (loss of per-document title AND date) for ALL
--- current readers during the stub window. Accepted because the reader follow-on is the
--- next-priority blocking dependency.
-
--- Step 1: Add type discriminator column to geschichten
-ALTER TABLE geschichten
-    ADD COLUMN type VARCHAR(50) DEFAULT 'STORY' NOT NULL;
-
--- Step 2: Create journey_items table
-CREATE TABLE journey_items (
-    id            UUID        NOT NULL DEFAULT gen_random_uuid(),
-    geschichte_id UUID        NOT NULL,
-    position      INT         NOT NULL,
-    document_id   UUID,
-    note          TEXT,
-    CONSTRAINT pk_journey_items PRIMARY KEY (id),
-    CONSTRAINT fk_journey_items_geschichte
-        FOREIGN KEY (geschichte_id) REFERENCES geschichten(id) ON DELETE CASCADE,
-    CONSTRAINT fk_journey_items_document
-        FOREIGN KEY (document_id) REFERENCES documents(id) ON DELETE SET NULL,
-    CONSTRAINT chk_journey_item_not_empty
-        CHECK (document_id IS NOT NULL OR note IS NOT NULL)
-);
-
--- Step 3: Index for ordered retrieval by geschichte + position
-CREATE INDEX idx_journey_items_geschichte_position
-    ON journey_items (geschichte_id, position ASC);
-
--- Step 4: Migrate geschichten_documents → journey_items
--- Positions are multiples of 1000 (headroom for drag-reorder).
--- Ordered by meta_date ASC NULLS LAST, then documents.id ASC as deterministic tiebreaker.
--- SELECT DISTINCT guards against duplicate junction rows producing duplicate journey items.
-INSERT INTO journey_items (id, geschichte_id, position, document_id)
-SELECT
-    gen_random_uuid(),
-    gd.geschichte_id,
-    (ROW_NUMBER() OVER (
-        PARTITION BY gd.geschichte_id
-        ORDER BY d.meta_date ASC NULLS LAST, d.id ASC
-    ) * 1000)::INT AS position,
-    gd.document_id
-FROM (
-    SELECT DISTINCT geschichte_id, document_id
-    FROM geschichten_documents
-) gd
-LEFT JOIN documents d ON d.id = gd.document_id;
-
--- Step 5: Drop the old junction table (irreversible — take the pg_dump first)
-DROP TABLE geschichten_documents;

backend/src/main/resources/db/migration/V73__add_journey_items_position_constraints.sql

@@ -1,19 +0,0 @@
--- Adds the two constraints that V72 deferred:
---   1. UNIQUE(geschichte_id, position) DEFERRABLE INITIALLY DEFERRED
---      Allows mid-transaction position swaps during reorder (checked at COMMIT, not per-row).
---      Requires transaction-level or session-level connection pooling (prod uses PgBouncer
---      in transaction mode — correct today; a future switch to statement-level would silently
---      break deferred checking at COMMIT).
---   2. CHECK (position > 0) — defense against off-by-one in the append path.
---
--- MUST run in a single transaction; Flyway's default per-migration transaction satisfies this.
--- Do NOT add executeInTransaction=false or any callback that splits this migration.
-
-ALTER TABLE journey_items
-    ADD CONSTRAINT uq_journey_items_geschichte_position
-        UNIQUE (geschichte_id, position)
-        DEFERRABLE INITIALLY DEFERRED;
-
-ALTER TABLE journey_items
-    ADD CONSTRAINT chk_journey_item_position
-        CHECK (position > 0);

backend/src/main/resources/db/migration/V74__journey_items_document_dedup_and_note_length.sql

@@ -1,37 +0,0 @@
--- Two constraints the service-level checks need as atomic backstops:
---
--- 1. Partial unique index on (geschichte_id, document_id): the append dedup
---    guard is a check-then-insert (existsByGeschichteIdAndDocumentId), so two
---    concurrent appends of the same document can both pass the pre-check.
---    The index rejects the second INSERT; JourneyItemService.append translates
---    the DataIntegrityViolationException into the same 409
---    JOURNEY_DOCUMENT_ALREADY_ADDED as the friendly pre-check.
---    Partial (WHERE document_id IS NOT NULL) — note-only interludes must not collide.
---
--- 2. CHECK on note length: mirrors chk_text_length on transcription_blocks.
---    2000 is the spec'd limit — JourneyItemService.MAX_NOTE_LENGTH, the frontend
---    maxlength, and the i18n error message all agree (#793).
---
--- Defensive cleanup first: a database that served writes on the base branch
--- (no dedup guard, MAX_NOTE_LENGTH = 5000) can hold rows that would make the
--- DDL below fail mid-migration and boot-loop the backend on a failed Flyway
--- row. Both statements are no-ops on a clean database.
-
--- Keep the earliest-positioned row of each (geschichte, document) pair.
-DELETE FROM journey_items a
-    USING journey_items b
-    WHERE a.geschichte_id = b.geschichte_id
-      AND a.document_id = b.document_id
-      AND a.document_id IS NOT NULL
-      AND a.position > b.position;
-
--- Clamp over-long notes written under the old 5000-char service limit.
-UPDATE journey_items SET note = left(note, 2000) WHERE length(note) > 2000;
-
-CREATE UNIQUE INDEX uq_journey_items_geschichte_document
-    ON journey_items (geschichte_id, document_id)
-    WHERE document_id IS NOT NULL;
-
-ALTER TABLE journey_items
-    ADD CONSTRAINT chk_journey_item_note_length
-        CHECK (note IS NULL OR length(note) <= 2000);

backend/src/main/resources/db/migration/V75__geschichten_journey_intro_length.sql

@@ -1,16 +0,0 @@
--- JOURNEY intros travel the verbatim (unsanitized) write path and get the same
--- three-layer bound as journey notes: frontend maxlength, the
--- GeschichteService.MAX_INTRO_LENGTH check, and this CHECK as the atomic backstop.
--- STORY bodies are sanitized Tiptap HTML and stay unbounded on purpose.
---
--- The title needs no CHECK here — VARCHAR(255) (V58) already bounds it at the
--- DB layer; the service-level check exists to turn that 500 into a friendly 400.
-
--- Defensive clamp first: intros written before this migration may exceed the
--- cap. No-op on a clean database.
-UPDATE geschichten SET body = left(body, 4000)
-    WHERE type = 'JOURNEY' AND length(body) > 4000;
-
-ALTER TABLE geschichten
-    ADD CONSTRAINT chk_geschichte_journey_intro_length
-        CHECK (type <> 'JOURNEY' OR body IS NULL OR length(body) <= 4000);

backend/src/main/resources/db/migration/V76__person_birth_death_to_localdate.sql

@@ -1,42 +0,0 @@
--- V76: persons.birth_year/death_year (integer) → birth_date/death_date (date)
--- plus NOT NULL precision columns mirroring documents.meta_date_precision.
--- Existing years are backfilled as YYYY-01-01 at YEAR precision (ADR-039).
--- One-way migration: rollback is a targeted pg_restore -t persons from the
--- pre-deploy backup (see docs/DEPLOYMENT.md).
-
--- Pre-check (data quality gate — not a race guard): abort on corrupt year data
--- before any DDL runs. Single-writer family archive, so no race window matters.
-DO $$ BEGIN
-  IF EXISTS (SELECT 1 FROM persons WHERE birth_year IS NOT NULL AND death_year IS NOT NULL AND birth_year > death_year)
-    THEN RAISE EXCEPTION 'V76 aborted: % persons have birth_year > death_year — fix data before migrating',
-      (SELECT COUNT(*) FROM persons WHERE birth_year IS NOT NULL AND death_year IS NOT NULL AND birth_year > death_year);
-  END IF;
-  IF EXISTS (SELECT 1 FROM persons WHERE birth_year = 0 OR death_year = 0)
-    THEN RAISE EXCEPTION 'V76 aborted: persons table contains birth_year=0 or death_year=0 rows — clean data before migrating';
-  END IF;
-END $$;
-
-ALTER TABLE persons ADD COLUMN birth_date date;
-ALTER TABLE persons ADD COLUMN birth_date_precision varchar(16) NOT NULL DEFAULT 'UNKNOWN';
-ALTER TABLE persons ADD COLUMN death_date date;
-ALTER TABLE persons ADD COLUMN death_date_precision varchar(16) NOT NULL DEFAULT 'UNKNOWN';
-
-UPDATE persons SET birth_date = make_date(birth_year, 1, 1), birth_date_precision = 'YEAR'
-    WHERE birth_year IS NOT NULL;
-UPDATE persons SET death_date = make_date(death_year, 1, 1), death_date_precision = 'YEAR'
-    WHERE death_year IS NOT NULL;
-
--- Named constraints: readable Postgres error messages when violated.
-ALTER TABLE persons ADD CONSTRAINT chk_person_birth_before_death
-    CHECK (death_date IS NULL OR birth_date IS NULL OR birth_date <= death_date);
-ALTER TABLE persons ADD CONSTRAINT chk_person_birth_date_precision_coherence
-    CHECK ((birth_date IS NULL) = (birth_date_precision = 'UNKNOWN'));
-ALTER TABLE persons ADD CONSTRAINT chk_person_birth_date_precision_values
-    CHECK (birth_date_precision IN ('DAY', 'MONTH', 'SEASON', 'YEAR', 'RANGE', 'APPROX', 'UNKNOWN'));
-ALTER TABLE persons ADD CONSTRAINT chk_person_death_date_precision_coherence
-    CHECK ((death_date IS NULL) = (death_date_precision = 'UNKNOWN'));
-ALTER TABLE persons ADD CONSTRAINT chk_person_death_date_precision_values
-    CHECK (death_date_precision IN ('DAY', 'MONTH', 'SEASON', 'YEAR', 'RANGE', 'APPROX', 'UNKNOWN'));
-
-ALTER TABLE persons DROP COLUMN birth_year;
-ALTER TABLE persons DROP COLUMN death_year;

backend/src/main/resources/db/migration/V77__add_timeline_events.sql

@@ -1,64 +0,0 @@
--- V77: timeline domain foundation (Zeitstrahl) — curated timeline events.
--- Forward-only, additive DDL. No rollback script: rollback requires manual DROP TABLE
--- (timeline_event_documents, timeline_event_persons, then timeline_events). See ADR-040.
---
--- The date block (event_date / date_precision / event_date_end) mirrors documents' so events
--- and letters share one rendering path. Two divergences from documents are INTENTIONAL and
--- enforced here in Postgres (ADR-040):
---   1. The RANGE rule is a strict biconditional (event_date_end non-null IFF RANGE), unlike
---      documents' open-ended ranges — a curated event always has a known, closed end.
---   2. date_precision <> 'UNKNOWN' — only OCR-inferred letters are ever undated; a curated
---      event always has at least a year. SEASON and APPROX stay legal (Sommer/ca. 1914).
-
-CREATE TABLE timeline_events (
-    id             UUID         NOT NULL DEFAULT gen_random_uuid(),
-    title          VARCHAR(255) NOT NULL,
-    type           VARCHAR(16)  NOT NULL,
-    event_date     DATE         NOT NULL,
-    date_precision VARCHAR(16)  NOT NULL DEFAULT 'YEAR',
-    event_date_end DATE,
-    description    TEXT,
-    created_by     UUID         NOT NULL,
-    created_at     TIMESTAMP,
-    updated_by     UUID         NOT NULL,
-    updated_at     TIMESTAMP,
-    version        BIGINT,
-    CONSTRAINT pk_timeline_events PRIMARY KEY (id),
-    -- event_date_end is non-null IFF precision is RANGE (both directions).
-    CONSTRAINT chk_timeline_event_range
-        CHECK ((date_precision = 'RANGE') = (event_date_end IS NOT NULL)),
-    -- Curated events are never undated. Forbids exactly UNKNOWN — every other
-    -- DatePrecision value (DAY, MONTH, SEASON, YEAR, RANGE, APPROX) stays legal.
-    CONSTRAINT chk_timeline_event_precision
-        CHECK (date_precision <> 'UNKNOWN')
-);
-
--- Join table: events ↔ persons involved.
-CREATE TABLE timeline_event_persons (
-    timeline_event_id UUID NOT NULL,
-    person_id         UUID NOT NULL,
-    CONSTRAINT pk_timeline_event_persons PRIMARY KEY (timeline_event_id, person_id),
-    CONSTRAINT fk_tep_event
-        FOREIGN KEY (timeline_event_id) REFERENCES timeline_events(id) ON DELETE CASCADE,
-    CONSTRAINT fk_tep_person
-        FOREIGN KEY (person_id) REFERENCES persons(id) ON DELETE CASCADE
-);
-
--- Join table: events ↔ supporting letters.
-CREATE TABLE timeline_event_documents (
-    timeline_event_id UUID NOT NULL,
-    document_id       UUID NOT NULL,
-    CONSTRAINT pk_timeline_event_documents PRIMARY KEY (timeline_event_id, document_id),
-    CONSTRAINT fk_ted_event
-        FOREIGN KEY (timeline_event_id) REFERENCES timeline_events(id) ON DELETE CASCADE,
-    CONSTRAINT fk_ted_document
-        FOREIGN KEY (document_id) REFERENCES documents(id) ON DELETE CASCADE
-);
-
--- Indexes added up-front (avoid the V62 FK-index retrofit debt): the two query columns plus
--- the inverse-side FK columns. timeline_event_id needs no extra index on either join table —
--- it is the leading column of the composite PK, so the PK index already serves those lookups.
-CREATE INDEX idx_timeline_events_event_date ON timeline_events (event_date);
-CREATE INDEX idx_timeline_events_type ON timeline_events (type);
-CREATE INDEX idx_timeline_event_persons_person_id ON timeline_event_persons (person_id);
-CREATE INDEX idx_timeline_event_documents_document_id ON timeline_event_documents (document_id);

backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java

@@ -402,7 +402,6 @@ class DocumentControllerTest {
     @WithMockUser(authorities = "WRITE_ALL")
     void deleteDocument_returns204_whenHasWritePermission() throws Exception {
         UUID id = UUID.randomUUID();
-        when(userService.findByEmail(any())).thenReturn(AppUser.builder().id(UUID.randomUUID()).build());
         mockMvc.perform(org.springframework.test.web.servlet.request.MockMvcRequestBuilders
                         .delete("/api/documents/" + id).with(csrf()))
                 .andExpect(status().isNoContent());

backend/src/test/java/org/raddatz/familienarchiv/document/DocumentLazyLoadingTest.java

@@ -131,28 +131,6 @@ class DocumentLazyLoadingTest {
                 .doesNotThrowAnyException();
     }
 
-    @Test
-    void searchDocuments_pureTextRelevance_doesNotThrowLazyInitializationException() {
-        // q + default sort + no other filters → the relevance fast path
-        // (relevanceSortedPageFromSql), which loads documents by id outside any
-        // transaction and must still deliver an initialized tags collection.
-        Person sender = savedPerson("Hans", "FtSender");
-        Tag tag = savedTag("FtTag");
-        savedDocument("Brief von Walter", "ft_doc.pdf", sender, Set.of(), Set.of(tag));
-
-        SearchFilters textOnly = new SearchFilters(
-                "Walter", null, null, null, null, null, null, null, null, false);
-
-        DocumentSearchResult result = documentService.searchDocuments(
-                textOnly, null, "DESC", PageRequest.of(0, 10));
-
-        assertThat(result.totalElements()).isEqualTo(1);
-        assertThatCode(() ->
-                result.items().forEach(i -> i.tags().size()))
-                .doesNotThrowAnyException();
-        assertThat(result.items().getFirst().tags()).extracting(Tag::getName).containsExactly("FtTag");
-    }
-
     @Test
     void searchDocuments_senderSort_doesNotThrowLazyInitializationException() {
         Person sender = savedPerson("Hans", "SsSender");

backend/src/test/java/org/raddatz/familienarchiv/document/DocumentRepositoryTest.java

@@ -624,88 +624,4 @@ class DocumentRepositoryTest {
                 .reviewed(reviewed)
                 .build();
     }
-
-    // ─── searchDocumentsByPersonId (via Specification) ───────────────────────
-
-    private Page<Document> searchByPerson(Person person, LocalDate from, LocalDate to) {
-        Specification<Document> spec = (root, query, cb) -> {
-            if (query != null) query.distinct(true);
-            var receiversJoin = root.join("receivers", jakarta.persistence.criteria.JoinType.LEFT);
-            var personPredicate = cb.or(
-                    cb.equal(root.get("sender"), person),
-                    cb.equal(receiversJoin, person));
-            var predicates = new java.util.ArrayList<>(java.util.List.of(personPredicate));
-            if (from != null) predicates.add(cb.greaterThanOrEqualTo(root.get("documentDate"), from));
-            if (to != null) predicates.add(cb.lessThanOrEqualTo(root.get("documentDate"), to));
-            return cb.and(predicates.toArray(new jakarta.persistence.criteria.Predicate[0]));
-        };
-        return documentRepository.findAll(spec, PageRequest.of(0, 10));
-    }
-
-    @Test
-    void searchByPersonSpec_returnsDocument_whenPersonIsSender() {
-        Person person = personRepository.save(Person.builder().lastName("Raddatz").build());
-        Document doc = documentRepository.save(Document.builder()
-                .title("Senderbrief").originalFilename("sender.pdf")
-                .status(DocumentStatus.UPLOADED).sender(person).build());
-
-        Page<Document> result = searchByPerson(person, null, null);
-
-        assertThat(result.getContent()).extracting(Document::getId).containsExactly(doc.getId());
-    }
-
-    @Test
-    void searchByPersonSpec_returnsDocument_whenPersonIsReceiver() {
-        Person person = personRepository.save(Person.builder().lastName("Raddatz").build());
-        Document doc = documentRepository.save(Document.builder()
-                .title("Empfängerbrief").originalFilename("receiver.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .receivers(new java.util.HashSet<>(List.of(person))).build());
-
-        Page<Document> result = searchByPerson(person, null, null);
-
-        assertThat(result.getContent()).extracting(Document::getId).containsExactly(doc.getId());
-    }
-
-    @Test
-    void searchByPersonSpec_returnsDocumentOnce_whenPersonIsBothSenderAndReceiver() {
-        Person person = personRepository.save(Person.builder().lastName("Raddatz").build());
-        Document doc = documentRepository.save(Document.builder()
-                .title("SenderEmpfänger").originalFilename("both.pdf")
-                .status(DocumentStatus.UPLOADED).sender(person)
-                .receivers(new java.util.HashSet<>(List.of(person))).build());
-
-        Page<Document> result = searchByPerson(person, null, null);
-
-        assertThat(result.getContent()).hasSize(1);
-        assertThat(result.getContent().get(0).getId()).isEqualTo(doc.getId());
-    }
-
-    @Test
-    void searchByPersonSpec_excludesDocuments_outsideDateRange() {
-        Person person = personRepository.save(Person.builder().lastName("Raddatz").build());
-        Document inside = documentRepository.save(Document.builder()
-                .title("Innen").originalFilename("inside.pdf").status(DocumentStatus.UPLOADED)
-                .sender(person).documentDate(LocalDate.of(1918, 6, 15)).build());
-        documentRepository.save(Document.builder()
-                .title("Außen").originalFilename("outside.pdf").status(DocumentStatus.UPLOADED)
-                .sender(person).documentDate(LocalDate.of(1920, 1, 1)).build());
-
-        Page<Document> result = searchByPerson(person, LocalDate.of(1914, 1, 1), LocalDate.of(1918, 12, 31));
-
-        assertThat(result.getContent()).extracting(Document::getId).containsExactly(inside.getId());
-    }
-
-    @Test
-    void searchByPersonSpec_returnsEmpty_whenNoMatchingDocuments() {
-        Person person = personRepository.save(Person.builder().lastName("Raddatz").build());
-        Person other = personRepository.save(Person.builder().lastName("Braun").build());
-        documentRepository.save(Document.builder()
-                .title("Fremder Brief").originalFilename("other.pdf")
-                .status(DocumentStatus.UPLOADED).sender(other).build());
-
-        Page<Document> result = searchByPerson(person, null, null);
-
-        assertThat(result.getContent()).isEmpty();
-    }
 }

backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java

@@ -81,7 +81,7 @@ class DocumentServiceSortTest {
         UUID id1 = UUID.randomUUID();
         List<Object[]> ftsRows = ftsRows(id1, 0.5d, 1L);
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(ftsRows);
-        when(documentRepository.findByIdIn(any()))
+        when(documentRepository.findAllById(any()))
                 .thenReturn(List.of(doc(id1)));
 
         documentService.searchDocuments(
@@ -101,7 +101,7 @@ class DocumentServiceSortTest {
         ftsRows.add(new Object[]{id1, 0.8d, 2L});
         ftsRows.add(new Object[]{id2, 0.3d, 2L});
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(ftsRows);
-        when(documentRepository.findByIdIn(any())).thenReturn(List.of(doc(id2), doc(id1))); // unordered from JPA
+        when(documentRepository.findAllById(any())).thenReturn(List.of(doc(id2), doc(id1))); // unordered from JPA
 
         DocumentSearchResult result = documentService.searchDocuments(
                 new SearchFilters("Brief", null, null, null, null, null, null, null, null, false),
@@ -119,7 +119,7 @@ class DocumentServiceSortTest {
         ftsRows.add(new Object[]{id1, 0.8d, 2L});
         ftsRows.add(new Object[]{id2, 0.3d, 2L});
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(ftsRows);
-        when(documentRepository.findByIdIn(any())).thenReturn(List.of(doc(id2), doc(id1)));
+        when(documentRepository.findAllById(any())).thenReturn(List.of(doc(id2), doc(id1)));
 
         DocumentSearchResult result = documentService.searchDocuments(
                 new SearchFilters("Brief", null, null, null, null, null, null, null, null, false),
@@ -153,7 +153,7 @@ class DocumentServiceSortTest {
         List<Object[]> ftsRows = new ArrayList<>();
         ftsRows.add(new Object[]{stringId, 0.5d, 1L});
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(ftsRows);
-        when(documentRepository.findByIdIn(any())).thenReturn(List.of(doc(uuidId)));
+        when(documentRepository.findAllById(any())).thenReturn(List.of(doc(uuidId)));
 
         DocumentSearchResult result = documentService.searchDocuments(
                 new SearchFilters("Brief", null, null, null, null, null, null, null, null, false),

backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java

@@ -30,7 +30,6 @@ import org.raddatz.familienarchiv.document.DocumentRepository;
 import org.raddatz.familienarchiv.filestorage.FileService;
 import org.raddatz.familienarchiv.tag.TagService;
 import org.raddatz.familienarchiv.person.PersonService;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
@@ -76,7 +75,6 @@ class DocumentServiceTest {
     @Mock AuditLogQueryService auditLogQueryService;
     @Mock TranscriptionBlockQueryService transcriptionBlockQueryService;
     @Mock ThumbnailAsyncRunner thumbnailAsyncRunner;
-    @Mock ApplicationEventPublisher eventPublisher;
     // Real factory (pure, dependency-free) so save-time title-regeneration tests exercise the
     // shared composition rather than a stub — the #726 single source of truth.
     @Spy DocumentTitleFactory documentTitleFactory = new DocumentTitleFactory();
@@ -89,7 +87,7 @@ class DocumentServiceTest {
         UUID id = UUID.randomUUID();
         when(documentRepository.existsById(id)).thenReturn(true);
 
-        documentService.deleteDocument(id, UUID.randomUUID());
+        documentService.deleteDocument(id);
 
         verify(documentRepository).deleteById(id);
     }
@@ -99,7 +97,7 @@ class DocumentServiceTest {
         UUID id = UUID.randomUUID();
         when(documentRepository.existsById(id)).thenReturn(false);
 
-        assertThatThrownBy(() -> documentService.deleteDocument(id, UUID.randomUUID()))
+        assertThatThrownBy(() -> documentService.deleteDocument(id))
                 .isInstanceOf(DomainException.class)
                 .hasMessageContaining(id.toString());
         verify(documentRepository, never()).deleteById(any());
@@ -2168,7 +2166,7 @@ class DocumentServiceTest {
         List<Object[]> ftsRows = new java.util.ArrayList<>();
         ftsRows.add(new Object[]{docId, 0.5d, 1L});
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(ftsRows);
-        when(documentRepository.findByIdIn(any())).thenReturn(List.of(doc));
+        when(documentRepository.findAllById(any())).thenReturn(List.of(doc));
         when(documentRepository.findEnrichmentData(any(), eq("Brief"))).thenReturn(rows);
 
         DocumentSearchResult result = documentService.searchDocuments(
@@ -2204,7 +2202,7 @@ class DocumentServiceTest {
         List<Object[]> snippetFtsRows = new java.util.ArrayList<>();
         snippetFtsRows.add(new Object[]{docId, 0.5d, 1L});
         when(documentRepository.findFtsPageRaw(anyString(), anyInt(), anyInt())).thenReturn(snippetFtsRows);
-        when(documentRepository.findByIdIn(any())).thenReturn(List.of(doc));
+        when(documentRepository.findAllById(any())).thenReturn(List.of(doc));
         when(documentRepository.findEnrichmentData(any(), eq("Brief"))).thenReturn(rows);
 
         DocumentSearchResult result = documentService.searchDocuments(

backend/src/test/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandlerTest.java

@@ -12,7 +12,6 @@ import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.http.ResponseEntity;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -38,30 +37,6 @@ class GlobalExceptionHandlerTest {
         }
     }
 
-    @Test
-    void handleGeneric_incorrectResultSize_staysOpaque_noHibernateOrRowCountLeak() {
-        // #731: before the fix, a case-colliding alias/name made Hibernate throw
-        // NonUniqueResultException → IncorrectResultSizeDataAccessException, which has no
-        // dedicated handler and falls through to handleGeneric. The fix removes the throw, but
-        // this pins the handler: a stray one must stay opaque — no Hibernate class name, no SQL,
-        // no "2 results were returned" row count reaching the client (CWE-209).
-        IncorrectResultSizeDataAccessException ex = new IncorrectResultSizeDataAccessException(
-                "query did not return a unique result: 2 results were returned", 1, 2);
-
-        try (MockedStatic<Sentry> sentryMock = mockStatic(Sentry.class)) {
-            ResponseEntity<GlobalExceptionHandler.ErrorResponse> response = handler.handleGeneric(ex);
-
-            assertThat(response.getStatusCode().value()).isEqualTo(500);
-            assertThat(response.getBody()).isNotNull();
-            assertThat(response.getBody().code()).isEqualTo(ErrorCode.INTERNAL_ERROR);
-            assertThat(response.getBody().message())
-                    .isEqualTo("An unexpected error occurred")
-                    .doesNotContain("results were returned")
-                    .doesNotContain("NonUnique")
-                    .doesNotContain("IncorrectResultSize");
-        }
-    }
-
     @Test
     void handleDataIntegrityViolation_returns400_withoutLeakingConstraint_orSentry() {
         // A DataIntegrityViolationException carries the constraint name + SQL in its message;

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteConstraintsTest.java

@@ -1,66 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * Raw-SQL constraint tests for geschichten — deliberately NOT @Transactional at
- * class level (see JourneyItemConstraintsTest for the rationale).
- *
- * The V75 CHECK is the atomic backstop for GeschichteService.MAX_INTRO_LENGTH on
- * the verbatim JOURNEY intro write path. STORY bodies are intentionally exempt.
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-class GeschichteConstraintsTest {
-
-    @MockitoBean
-    S3Client s3Client;
-
-    @Autowired JdbcTemplate jdbcTemplate;
-
-    private UUID insertGeschichte(String type, String body) {
-        UUID id = UUID.randomUUID();
-        jdbcTemplate.update(
-                "INSERT INTO geschichten (id, title, body, status, type, created_at, updated_at) "
-                        + "VALUES (?, ?, ?, 'DRAFT', ?, now(), now())",
-                id, "Constraints-Test", body, type);
-        return id;
-    }
-
-    @Test
-    void journey_intro_check_rejects_4001_chars() {
-        assertThatThrownBy(() -> insertGeschichte("JOURNEY", "x".repeat(4001)))
-                .isInstanceOf(DataIntegrityViolationException.class);
-    }
-
-    @Test
-    void journey_intro_check_accepts_exactly_4000_chars() {
-        UUID id = insertGeschichte("JOURNEY", "x".repeat(4000));
-        Integer count = jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM geschichten WHERE id = ?", Integer.class, id);
-        assertThat(count).isEqualTo(1);
-    }
-
-    @Test
-    void story_bodies_are_not_constrained_by_the_intro_check() {
-        UUID id = insertGeschichte("STORY", "<p>" + "x".repeat(4001) + "</p>");
-        Integer count = jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM geschichten WHERE id = ?", Integer.class, id);
-        assertThat(count).isEqualTo(1);
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteControllerTest.java

@@ -2,13 +2,15 @@ package org.raddatz.familienarchiv.geschichte;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
+import org.raddatz.familienarchiv.security.SecurityConfig;
+import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemService;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemView;
-import org.raddatz.familienarchiv.security.SecurityConfig;
+import org.raddatz.familienarchiv.geschichte.Geschichte;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.security.PermissionAspect;
 import org.raddatz.familienarchiv.user.CustomUserDetailsService;
+import org.raddatz.familienarchiv.geschichte.GeschichteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
@@ -19,25 +21,22 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
 
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 
 @WebMvcTest(GeschichteController.class)
 @Import({SecurityConfig.class, PermissionAspect.class, AopAutoConfiguration.class})
@@ -48,9 +47,11 @@ class GeschichteControllerTest {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
 
-    @MockitoBean GeschichteService geschichteService;
-    @MockitoBean JourneyItemService journeyItemService;
-    @MockitoBean CustomUserDetailsService customUserDetailsService;
+    @MockitoBean
+    GeschichteService geschichteService;
+
+    @MockitoBean
+    CustomUserDetailsService customUserDetailsService;
 
     // ─── GET /api/geschichten ────────────────────────────────────────────────
 
@@ -64,7 +65,7 @@ class GeschichteControllerTest {
     @WithMockUser(authorities = "READ_ALL")
     void list_returns200_forReader() throws Exception {
         when(geschichteService.list(any(), any(), any(), anyInt()))
-                .thenReturn(List.of(summaryStub("Story A")));
+                .thenReturn(List.of(published(UUID.randomUUID(), "Story A")));
 
         mockMvc.perform(get("/api/geschichten"))
                 .andExpect(status().isOk())
@@ -100,50 +101,13 @@ class GeschichteControllerTest {
         verify(geschichteService).list(any(), eq(List.of(a, b)), any(), anyInt());
     }
 
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void list_passesDocumentIdFilterToService() throws Exception {
-        UUID documentId = UUID.randomUUID();
-        when(geschichteService.list(any(), any(), eq(documentId), anyInt()))
-                .thenReturn(List.of());
-
-        mockMvc.perform(get("/api/geschichten").param("documentId", documentId.toString()))
-                .andExpect(status().isOk());
-
-        verify(geschichteService).list(any(), any(), eq(documentId), anyInt());
-    }
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void list_passesLimitToService() throws Exception {
-        when(geschichteService.list(any(), any(), any(), eq(5)))
-                .thenReturn(List.of());
-
-        mockMvc.perform(get("/api/geschichten").param("limit", "5"))
-                .andExpect(status().isOk());
-
-        verify(geschichteService).list(any(), any(), any(), eq(5));
-    }
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void list_passesStatusFilterToService() throws Exception {
-        when(geschichteService.list(eq(GeschichteStatus.PUBLISHED), any(), any(), anyInt()))
-                .thenReturn(List.of());
-
-        mockMvc.perform(get("/api/geschichten").param("status", "PUBLISHED"))
-                .andExpect(status().isOk());
-
-        verify(geschichteService).list(eq(GeschichteStatus.PUBLISHED), any(), any(), anyInt());
-    }
-
     // ─── GET /api/geschichten/{id} ───────────────────────────────────────────
 
     @Test
     @WithMockUser(authorities = "READ_ALL")
     void getById_returns200_whenFound() throws Exception {
         UUID id = UUID.randomUUID();
-        when(geschichteService.getView(id)).thenReturn(viewStub(id, "Hello"));
+        when(geschichteService.getById(id)).thenReturn(published(id, "Hello"));
 
         mockMvc.perform(get("/api/geschichten/{id}", id))
                 .andExpect(status().isOk())
@@ -155,7 +119,7 @@ class GeschichteControllerTest {
     @WithMockUser(authorities = "READ_ALL")
     void getById_returns404_whenServiceThrowsNotFound() throws Exception {
         UUID id = UUID.randomUUID();
-        when(geschichteService.getView(id))
+        when(geschichteService.getById(id))
                 .thenThrow(DomainException.notFound(ErrorCode.GESCHICHTE_NOT_FOUND, "x"));
 
         mockMvc.perform(get("/api/geschichten/{id}", id))
@@ -187,7 +151,7 @@ class GeschichteControllerTest {
     void create_returns201_withBlogWrite() throws Exception {
         UUID id = UUID.randomUUID();
         when(geschichteService.create(any(GeschichteUpdateDTO.class)))
-                .thenReturn(viewStub(id, "New", GeschichteStatus.DRAFT));
+                .thenReturn(draft(id, "New"));
 
         GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
         dto.setTitle("New");
@@ -215,7 +179,7 @@ class GeschichteControllerTest {
     void update_returns200_withBlogWrite() throws Exception {
         UUID id = UUID.randomUUID();
         when(geschichteService.update(eq(id), any(GeschichteUpdateDTO.class)))
-                .thenReturn(viewStub(id, "Updated", GeschichteStatus.PUBLISHED));
+                .thenReturn(published(id, "Updated"));
 
         mockMvc.perform(patch("/api/geschichten/{id}", id).with(csrf())
                         .contentType(MediaType.APPLICATION_JSON)
@@ -244,202 +208,31 @@ class GeschichteControllerTest {
         verify(geschichteService).delete(id);
     }
 
-    // ─── POST /api/geschichten/{id}/items ────────────────────────────────────
-
-    @Test
-    void appendItem_returns401_whenUnauthenticated() throws Exception {
-        mockMvc.perform(post("/api/geschichten/{id}/items", UUID.randomUUID()).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"x\"}"))
-                .andExpect(status().isUnauthorized());
-    }
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void appendItem_returns403_whenLackingBlogWrite() throws Exception {
-        mockMvc.perform(post("/api/geschichten/{id}/items", UUID.randomUUID()).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"x\"}"))
-                .andExpect(status().isForbidden());
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void appendItem_returns201_withBlogWrite() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        when(journeyItemService.append(eq(id), any())).thenReturn(itemViewStub(itemId, 10, "Note"));
-
-        mockMvc.perform(post("/api/geschichten/{id}/items", id).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"Note\"}"))
-                .andExpect(status().isCreated())
-                .andExpect(jsonPath("$.id").value(itemId.toString()))
-                .andExpect(jsonPath("$.position").value(10));
-    }
-
-    // ─── PATCH /api/geschichten/{id}/items/{itemId} ──────────────────────────
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void updateItemNote_returns403_whenLackingBlogWrite() throws Exception {
-        mockMvc.perform(patch("/api/geschichten/{id}/items/{itemId}",
-                        UUID.randomUUID(), UUID.randomUUID()).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"x\"}"))
-                .andExpect(status().isForbidden());
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void updateItemNote_returns200_withBlogWrite() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        when(journeyItemService.updateNote(eq(id), eq(itemId), any()))
-                .thenReturn(itemViewStub(itemId, 10, "Updated"));
-
-        mockMvc.perform(patch("/api/geschichten/{id}/items/{itemId}", id, itemId).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"Updated\"}"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.note").value("Updated"));
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void updateItemNote_json_null_note_is_deserialized_as_empty_Optional() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        when(journeyItemService.updateNote(eq(id), eq(itemId), any()))
-                .thenReturn(itemViewStub(itemId, 10, null));
-
-        // Raw JSON — local objectMapper lacks JsonNullableModule
-        mockMvc.perform(patch("/api/geschichten/{id}/items/{itemId}", id, itemId).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\": null}"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.note").value(nullValue()));
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void updateItemNote_returns404_whenItemNotFound() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        when(journeyItemService.updateNote(eq(id), eq(itemId), any()))
-                .thenThrow(DomainException.notFound(ErrorCode.JOURNEY_ITEM_NOT_FOUND, "not found"));
-
-        mockMvc.perform(patch("/api/geschichten/{id}/items/{itemId}", id, itemId).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"x\"}"))
-                .andExpect(status().isNotFound())
-                .andExpect(jsonPath("$.code").value("JOURNEY_ITEM_NOT_FOUND"));
-    }
-
-    // ─── DELETE /api/geschichten/{id}/items/{itemId} ─────────────────────────
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void deleteItem_returns403_whenLackingBlogWrite() throws Exception {
-        mockMvc.perform(delete("/api/geschichten/{id}/items/{itemId}",
-                        UUID.randomUUID(), UUID.randomUUID()).with(csrf()))
-                .andExpect(status().isForbidden());
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void deleteItem_returns204_withBlogWrite() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-
-        mockMvc.perform(delete("/api/geschichten/{id}/items/{itemId}", id, itemId).with(csrf()))
-                .andExpect(status().isNoContent());
-
-        verify(journeyItemService).delete(id, itemId);
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void deleteItem_returns404_whenItemNotFound() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        org.mockito.Mockito.doThrow(DomainException.notFound(ErrorCode.JOURNEY_ITEM_NOT_FOUND, "not found"))
-                .when(journeyItemService).delete(id, itemId);
-
-        mockMvc.perform(delete("/api/geschichten/{id}/items/{itemId}", id, itemId).with(csrf()))
-                .andExpect(status().isNotFound())
-                .andExpect(jsonPath("$.code").value("JOURNEY_ITEM_NOT_FOUND"));
-    }
-
-    // ─── PUT /api/geschichten/{id}/items/reorder ─────────────────────────────
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void reorderItems_returns403_whenLackingBlogWrite() throws Exception {
-        mockMvc.perform(put("/api/geschichten/{id}/items/reorder", UUID.randomUUID()).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"itemIds\":[]}"))
-                .andExpect(status().isForbidden());
-    }
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void reorderItems_returns200_withBlogWrite() throws Exception {
-        UUID id = UUID.randomUUID();
-        UUID itemId = UUID.randomUUID();
-        when(journeyItemService.reorder(eq(id), any())).thenReturn(List.of(itemViewStub(itemId, 10, null)));
-
-        mockMvc.perform(put("/api/geschichten/{id}/items/reorder", id).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"itemIds\":[\"" + itemId + "\"]}"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$[0].id").value(itemId.toString()));
-    }
-
-    // ─── error mapping ───────────────────────────────────────────────────────
-
-    @Test
-    @WithMockUser(authorities = "BLOG_WRITE")
-    void appendItem_returns409_on_position_conflict() throws Exception {
-        UUID id = UUID.randomUUID();
-        when(journeyItemService.append(eq(id), any()))
-                .thenThrow(DomainException.conflict(ErrorCode.JOURNEY_ITEM_POSITION_CONFLICT, "conflict"));
-
-        mockMvc.perform(post("/api/geschichten/{id}/items", id).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"note\":\"x\"}"))
-                .andExpect(status().isConflict())
-                .andExpect(jsonPath("$.code").value("JOURNEY_ITEM_POSITION_CONFLICT"));
-    }
-
     // ─── helpers ─────────────────────────────────────────────────────────────
 
-    private JourneyItemView itemViewStub(UUID id, int position, String note) {
-        return new JourneyItemView(id, position, null, note);
+    private Geschichte published(UUID id, String title) {
+        return Geschichte.builder()
+                .id(id)
+                .title(title)
+                .body("<p>x</p>")
+                .status(GeschichteStatus.PUBLISHED)
+                .publishedAt(LocalDateTime.now())
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .persons(new HashSet<>())
+                .documents(new HashSet<>())
+                .build();
     }
 
-    private GeschichteView viewStub(UUID id, String title) {
-        return viewStub(id, title, GeschichteStatus.PUBLISHED);
-    }
-
-    private GeschichteView viewStub(UUID id, String title, GeschichteStatus status) {
-        return new GeschichteView(id, title, "<p>x</p>",
-                status, GeschichteType.STORY,
-                null, new HashSet<>(), List.of(),
-                LocalDateTime.now(), LocalDateTime.now(), LocalDateTime.now());
-    }
-
-    /** Concrete implementation — Mockito interface mocks are not serialized reliably by Jackson. */
-    private GeschichteSummary summaryStub(String title) {
-        return new GeschichteSummary() {
-            public UUID getId() { return UUID.randomUUID(); }
-            public String getTitle() { return title; }
-            public GeschichteStatus getStatus() { return GeschichteStatus.PUBLISHED; }
-            public GeschichteType getType() { return GeschichteType.STORY; }
-            public AuthorSummary getAuthor() { return null; }
-            public LocalDateTime getPublishedAt() { return LocalDateTime.now(); }
-            public LocalDateTime getUpdatedAt() { return LocalDateTime.now(); }
-            public String getBody() { return null; }
-        };
+    private Geschichte draft(UUID id, String title) {
+        return Geschichte.builder()
+                .id(id)
+                .title(title)
+                .status(GeschichteStatus.DRAFT)
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .persons(new HashSet<>())
+                .documents(new HashSet<>())
+                .build();
     }
 }

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteHttpTest.java

@@ -1,298 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItem;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.AppUserRepository;
-import org.raddatz.familienarchiv.user.UserGroup;
-import org.raddatz.familienarchiv.user.UserGroupRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestTemplate;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Verifies Geschichte HTTP behaviour end-to-end at the real servlet layer.
- *
- * <p>No {@code @Transactional} at class level — that would keep a session open and
- * mask LazyInitializationException caused by open-in-view: false. Each test seeds data
- * directly via repositories and relies on the service's own transaction boundaries.
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-class GeschichteHttpTest {
-
-    @LocalServerPort int port;
-    @MockitoBean S3Client s3Client;
-
-    @Autowired GeschichteRepository geschichteRepository;
-    @Autowired AppUserRepository appUserRepository;
-    @Autowired UserGroupRepository userGroupRepository;
-    @Autowired PasswordEncoder passwordEncoder;
-
-    private RestTemplate http;
-    private String baseUrl;
-
-    private static final String WRITER_EMAIL = "geschichten-http-writer@test.de";
-    private static final String WRITER_PASSWORD = "pass!Geschichte1";
-
-    @BeforeEach
-    void setUp() {
-        http = noThrowRestTemplate();
-        baseUrl = "http://localhost:" + port;
-        geschichteRepository.deleteAll();
-        appUserRepository.findByEmail(WRITER_EMAIL).ifPresent(appUserRepository::delete);
-        appUserRepository.findByEmail(BLOG_WRITER_EMAIL).ifPresent(appUserRepository::delete);
-        userGroupRepository.findByName("HttpTest-BlogWriters").ifPresent(userGroupRepository::delete);
-        appUserRepository.save(AppUser.builder()
-                .email(WRITER_EMAIL)
-                .password(passwordEncoder.encode(WRITER_PASSWORD))
-                .build());
-    }
-
-    // ─── GET /api/geschichten ────────────────────────────────────────────────
-
-    @Test
-    void list_returns_200_and_empty_array_when_no_stories_exist() {
-        String session = loginAsWriter();
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten", HttpMethod.GET,
-                new HttpEntity<>(sessionHeaders(session)), String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(200);
-        assertThat(response.getBody()).isEqualTo("[]");
-    }
-
-    @Test
-    void list_returns_200_and_does_not_500_when_stories_have_journey_items() {
-        // Seed a JOURNEY directly — items are LAZY; without @Transactional(readOnly=true) +
-        // Hibernate.initialize in getById() this would 500. list() uses a projection so it
-        // must also never touch items.
-        AppUser writer = appUserRepository.findByEmail(WRITER_EMAIL).orElseThrow();
-        Geschichte journey = Geschichte.builder()
-                .title("Reise durch die Briefe")
-                .status(GeschichteStatus.PUBLISHED)
-                .type(GeschichteType.JOURNEY)
-                .author(writer)
-                .publishedAt(LocalDateTime.now())
-                .items(new ArrayList<>())
-                .persons(new HashSet<>())
-                .build();
-        JourneyItem item = JourneyItem.builder()
-                .geschichte(journey)
-                .position(1000)
-                .note("Einleitung")
-                .build();
-        journey.getItems().add(item);
-        geschichteRepository.save(journey);
-
-        String session = loginAsWriter();
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten", HttpMethod.GET,
-                new HttpEntity<>(sessionHeaders(session)), String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(200);
-        assertThat(response.getBody()).contains("Reise durch die Briefe");
-    }
-
-    // ─── GET /api/geschichten/{id} ───────────────────────────────────────────
-
-    @Test
-    void getById_returns_200_with_items_and_does_not_500_open_in_view_false() {
-        // This test is the canonical guard against LazyInitializationException.
-        // open-in-view: false means the Hibernate session is closed when Jackson serializes.
-        // GeschichteService.getById() must initialize items inside its @Transactional boundary.
-        AppUser writer = appUserRepository.findByEmail(WRITER_EMAIL).orElseThrow();
-        Geschichte journey = Geschichte.builder()
-                .title("Familiengeschichte")
-                .status(GeschichteStatus.PUBLISHED)
-                .type(GeschichteType.JOURNEY)
-                .author(writer)
-                .publishedAt(LocalDateTime.now())
-                .items(new ArrayList<>())
-                .persons(new HashSet<>())
-                .build();
-        JourneyItem note = JourneyItem.builder()
-                .geschichte(journey).position(1000).note("Prolog").build();
-        JourneyItem note2 = JourneyItem.builder()
-                .geschichte(journey).position(2000).note("Epilog").build();
-        journey.getItems().add(note);
-        journey.getItems().add(note2);
-        Geschichte saved = geschichteRepository.save(journey);
-
-        String session = loginAsWriter();
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten/" + saved.getId(), HttpMethod.GET,
-                new HttpEntity<>(sessionHeaders(session)), String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(200);
-        assertThat(response.getBody())
-                .contains("Familiengeschichte")
-                .contains("Prolog")
-                .contains("Epilog");
-    }
-
-    @Test
-    void getById_returns_404_for_unknown_id() {
-        String session = loginAsWriter();
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten/" + UUID.randomUUID(), HttpMethod.GET,
-                new HttpEntity<>(sessionHeaders(session)), String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(404);
-        assertThat(response.getBody()).contains("GESCHICHTE_NOT_FOUND");
-    }
-
-    @Test
-    void getById_returns_404_for_draft_when_reader_lacks_BLOG_WRITE() {
-        AppUser writer = appUserRepository.findByEmail(WRITER_EMAIL).orElseThrow();
-        Geschichte draft = Geschichte.builder()
-                .title("Geheimer Entwurf")
-                .status(GeschichteStatus.DRAFT)
-                .author(writer)
-                .items(new ArrayList<>())
-                .persons(new HashSet<>())
-                .build();
-        Geschichte saved = geschichteRepository.save(draft);
-
-        // Writer lacks explicit BLOG_WRITE permission in the app_users table,
-        // so from the service's perspective they're a reader.
-        String session = loginAsWriter();
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten/" + saved.getId(), HttpMethod.GET,
-                new HttpEntity<>(sessionHeaders(session)), String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(404);
-    }
-
-    // ─── PATCH /api/geschichten/{id} ─────────────────────────────────────────
-
-    @Test
-    void update_returns_200_and_serializes_items_open_in_view_false() {
-        // Canonical guard for the write path: PATCH must not 500 when the response
-        // is serialized after the service transaction closed. The raw entity carries
-        // a dead lazy items proxy at that point — the endpoint must answer with a
-        // view assembled inside the transaction.
-        AppUser writer = blogWriter();
-        Geschichte journey = Geschichte.builder()
-                .title("Reise vor dem Umbenennen")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .author(writer)
-                .items(new ArrayList<>())
-                .persons(new HashSet<>())
-                .build();
-        journey.getItems().add(JourneyItem.builder()
-                .geschichte(journey).position(1000).note("Prolog").build());
-        Geschichte saved = geschichteRepository.save(journey);
-
-        String session = loginAs(BLOG_WRITER_EMAIL, BLOG_WRITER_PASSWORD);
-        ResponseEntity<String> response = http.exchange(
-                baseUrl + "/api/geschichten/" + saved.getId(), HttpMethod.PATCH,
-                new HttpEntity<>("{\"title\":\"Reise nach dem Umbenennen\"}", csrfJsonHeaders(session)),
-                String.class);
-
-        assertThat(response.getStatusCode().value()).isEqualTo(200);
-        assertThat(response.getBody())
-                .contains("Reise nach dem Umbenennen")
-                .contains("Prolog");
-    }
-
-    // ─── helpers ─────────────────────────────────────────────────────────────
-
-    private static final String BLOG_WRITER_EMAIL = "geschichten-http-blogwriter@test.de";
-    private static final String BLOG_WRITER_PASSWORD = "pass!Geschichte2";
-
-    /** A user whose group actually grants BLOG_WRITE — unlike the plain writer above. */
-    private AppUser blogWriter() {
-        UserGroup group = userGroupRepository.save(UserGroup.builder()
-                .name("HttpTest-BlogWriters")
-                .permissions(new HashSet<>(Set.of("BLOG_WRITE")))
-                .build());
-        return appUserRepository.save(AppUser.builder()
-                .email(BLOG_WRITER_EMAIL)
-                .password(passwordEncoder.encode(BLOG_WRITER_PASSWORD))
-                .groups(new HashSet<>(Set.of(group)))
-                .build());
-    }
-
-    /** Session cookie + double-submit CSRF pair + JSON content type for write requests. */
-    private HttpHeaders csrfJsonHeaders(String sessionId) {
-        String xsrf = UUID.randomUUID().toString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Cookie", "fa_session=" + sessionId + "; XSRF-TOKEN=" + xsrf);
-        headers.set("X-XSRF-TOKEN", xsrf);
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        return headers;
-    }
-
-    private String loginAsWriter() {
-        return loginAs(WRITER_EMAIL, WRITER_PASSWORD);
-    }
-
-    private String loginAs(String email, String password) {
-        String xsrf = UUID.randomUUID().toString();
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.set("Cookie", "XSRF-TOKEN=" + xsrf);
-        headers.set("X-XSRF-TOKEN", xsrf);
-        String body = "{\"email\":\"" + email + "\",\"password\":\"" + password + "\"}";
-        ResponseEntity<String> resp = http.postForEntity(
-                baseUrl + "/api/auth/login", new HttpEntity<>(body, headers), String.class);
-        return extractFaSessionCookie(resp);
-    }
-
-    private HttpHeaders sessionHeaders(String sessionId) {
-        HttpHeaders headers = new HttpHeaders();
-        headers.set("Cookie", "fa_session=" + sessionId);
-        return headers;
-    }
-
-    private String extractFaSessionCookie(ResponseEntity<?> response) {
-        List<String> setCookieHeader = response.getHeaders().get("Set-Cookie");
-        if (setCookieHeader == null) return "";
-        return setCookieHeader.stream()
-                .filter(c -> c.startsWith("fa_session="))
-                .map(c -> c.split(";")[0].substring("fa_session=".length()))
-                .findFirst()
-                .orElse("");
-    }
-
-    private RestTemplate noThrowRestTemplate() {
-        // JDK HttpClient factory — the default HttpURLConnection factory cannot send PATCH.
-        RestTemplate template = new RestTemplate(new JdkClientHttpRequestFactory());
-        template.setErrorHandler(new DefaultResponseErrorHandler() {
-            @Override
-            public boolean hasError(ClientHttpResponse response) throws IOException {
-                return false;
-            }
-        });
-        return template;
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteListProjectionTest.java

@@ -1,262 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.config.FlywayConfig;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItem;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemRepository;
-import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.person.PersonRepository;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.AppUserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
-import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
-import org.springframework.context.annotation.Import;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-@Import({PostgresContainerConfig.class, FlywayConfig.class})
-class GeschichteListProjectionTest {
-
-    @Autowired GeschichteRepository geschichteRepository;
-    @Autowired AppUserRepository appUserRepository;
-    @Autowired PersonRepository personRepository;
-    @Autowired DocumentRepository documentRepository;
-    @Autowired JourneyItemRepository journeyItemRepository;
-
-    AppUser author;
-    AppUser otherAuthor;
-
-    @BeforeEach
-    void setUp() {
-        geschichteRepository.deleteAll();
-        author = appUserRepository.save(AppUser.builder()
-                .email("author@test").password("pw").build());
-        otherAuthor = appUserRepository.save(AppUser.builder()
-                .email("other@test").password("pw").build());
-    }
-
-    // ─── findSummaries returns only the requested status ─────────────────────
-
-    @Test
-    void findSummaries_returns_only_published_stories_when_effectiveStatus_is_PUBLISHED() {
-        geschichteRepository.save(published("Veröffentlicht", author));
-        geschichteRepository.save(draft("Entwurf", author));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getTitle()).isEqualTo("Veröffentlicht");
-    }
-
-    @Test
-    void findSummaries_carries_updatedAt_for_dashboard_relative_times() {
-        // ReaderDraftsModule renders "bearbeitet vor X" from updatedAt — the
-        // projection must carry it for drafts, where publishedAt is null.
-        geschichteRepository.save(draft("Mein Entwurf", author));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.DRAFT, author.getId(), sentinel(), 0, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getUpdatedAt()).isNotNull();
-    }
-
-    @Test
-    void findSummaries_returns_empty_list_when_no_published_geschichten_exist() {
-        geschichteRepository.save(draft("Nur Entwurf", author));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, null);
-
-        assertThat(result).isEmpty();
-    }
-
-    // ─── AuthorSummary nested projection ─────────────────────────────────────
-
-    @Test
-    void findSummaries_exposes_nested_author_names_but_never_email() {
-        AppUser richAuthor = appUserRepository.save(AppUser.builder()
-                .firstName("Franz").lastName("Raddatz")
-                .email("franz@raddatz.de").password("pw").build());
-        geschichteRepository.save(published("Briefe aus der Front", richAuthor));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, null);
-
-        assertThat(result).hasSize(1);
-        GeschichteSummary.AuthorSummary a = result.get(0).getAuthor();
-        assertThat(a.getFirstName()).isEqualTo("Franz");
-        assertThat(a.getLastName()).isEqualTo("Raddatz");
-        // Design rule (GeschichteView.AuthorView javadoc): author projections never
-        // expose email or group memberships to readers.
-        assertThat(GeschichteSummary.AuthorSummary.class.getMethods())
-                .extracting(java.lang.reflect.Method::getName)
-                .doesNotContain("getEmail");
-    }
-
-    // ─── GeschichteType is exposed ────────────────────────────────────────────
-
-    @Test
-    void findSummaries_exposes_type_field() {
-        Geschichte journey = Geschichte.builder()
-                .title("Eine Reise")
-                .status(GeschichteStatus.PUBLISHED)
-                .type(GeschichteType.JOURNEY)
-                .author(author)
-                .publishedAt(LocalDateTime.now())
-                .build();
-        geschichteRepository.save(journey);
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getType()).isEqualTo(GeschichteType.JOURNEY);
-    }
-
-    // ─── authorId filter (own-drafts gate) ───────────────────────────────────
-
-    @Test
-    void findSummaries_with_authorId_returns_only_own_drafts() {
-        geschichteRepository.save(draft("Mein Entwurf", author));
-        geschichteRepository.save(draft("Fremder Entwurf", otherAuthor));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.DRAFT, author.getId(), sentinel(), 0, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getTitle()).isEqualTo("Mein Entwurf");
-    }
-
-    // ─── personCount = 0 → no person filter ──────────────────────────────────
-
-    @Test
-    void findSummaries_with_personCount_zero_ignores_personIds_and_returns_all() {
-        geschichteRepository.save(published("A", author));
-        geschichteRepository.save(published("B", author));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, null);
-
-        assertThat(result).hasSize(2);
-    }
-
-    // ─── personCount > 0 AND-semantics ───────────────────────────────────────
-
-    @Test
-    void findSummaries_with_one_personId_returns_only_linked_stories() {
-        Person franz = personRepository.save(Person.builder().firstName("Franz").lastName("R").build());
-        Person anna = personRepository.save(Person.builder().firstName("Anna").lastName("R").build());
-
-        Geschichte withFranz = published("Franz story", author);
-        withFranz.getPersons().add(franz);
-        geschichteRepository.save(withFranz);
-
-        Geschichte withAnna = published("Anna story", author);
-        withAnna.getPersons().add(anna);
-        geschichteRepository.save(withAnna);
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, List.of(franz.getId()), 1, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getTitle()).isEqualTo("Franz story");
-    }
-
-    @Test
-    void findSummaries_with_two_personIds_uses_AND_semantics() {
-        Person franz = personRepository.save(Person.builder().firstName("Franz").lastName("R").build());
-        Person anna = personRepository.save(Person.builder().firstName("Anna").lastName("R").build());
-
-        Geschichte both = published("Both", author);
-        both.getPersons().add(franz);
-        both.getPersons().add(anna);
-        geschichteRepository.save(both);
-
-        Geschichte onlyFranz = published("Only Franz", author);
-        onlyFranz.getPersons().add(franz);
-        geschichteRepository.save(onlyFranz);
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, List.of(franz.getId(), anna.getId()), 2, null);
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getTitle()).isEqualTo("Both");
-    }
-
-    // ─── documentId filter (JPQL EXISTS subquery) ────────────────────────────
-
-    @Test
-    void findSummaries_with_documentId_returns_journey_containing_that_document() {
-        Document doc = documentRepository.save(Document.builder()
-                .title("Brief").originalFilename("brief.pdf").status(DocumentStatus.UPLOADED).build());
-        Geschichte withDoc = geschichteRepository.save(journey("Reise mit Dokument", author));
-        Geschichte withoutDoc = geschichteRepository.save(journey("Reise ohne Dokument", author));
-        journeyItemRepository.save(JourneyItem.builder()
-                .geschichte(withDoc).document(doc).position(1).build());
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, doc.getId());
-
-        assertThat(result).hasSize(1);
-        assertThat(result.get(0).getTitle()).isEqualTo("Reise mit Dokument");
-        assertThat(result).extracting(GeschichteSummary::getTitle).doesNotContain("Reise ohne Dokument");
-    }
-
-    @Test
-    void findSummaries_with_unknown_documentId_returns_empty() {
-        geschichteRepository.save(journey("Irgendeine Reise", author));
-
-        List<GeschichteSummary> result = geschichteRepository.findSummaries(
-                GeschichteStatus.PUBLISHED, null, sentinel(), 0, UUID.randomUUID());
-
-        assertThat(result).isEmpty();
-    }
-
-    // ─── helpers ─────────────────────────────────────────────────────────────
-
-    private Geschichte published(String title, AppUser writer) {
-        return Geschichte.builder()
-                .title(title)
-                .status(GeschichteStatus.PUBLISHED)
-                .author(writer)
-                .publishedAt(LocalDateTime.now())
-                .build();
-    }
-
-    private Geschichte draft(String title, AppUser writer) {
-        return Geschichte.builder()
-                .title(title)
-                .status(GeschichteStatus.DRAFT)
-                .author(writer)
-                .build();
-    }
-
-    private Geschichte journey(String title, AppUser writer) {
-        return Geschichte.builder()
-                .title(title)
-                .status(GeschichteStatus.PUBLISHED)
-                .type(GeschichteType.JOURNEY)
-                .author(writer)
-                .publishedAt(LocalDateTime.now())
-                .build();
-    }
-
-    /** Sentinel UUID passed when personCount=0 — the IN() clause is never evaluated. */
-    private List<UUID> sentinel() {
-        return List.of(UUID.fromString("00000000-0000-0000-0000-000000000000"));
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteQueryServiceTest.java

@@ -1,38 +0,0 @@
-package org.raddatz.familienarchiv.geschichte;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class GeschichteQueryServiceTest {
-
-    @Mock
-    GeschichteRepository geschichteRepository;
-
-    @InjectMocks
-    GeschichteQueryService geschichteQueryService;
-
-    @Test
-    void existsById_returns_true_when_geschichte_exists() {
-        UUID id = UUID.randomUUID();
-        when(geschichteRepository.existsById(id)).thenReturn(true);
-
-        assertThat(geschichteQueryService.existsById(id)).isTrue();
-    }
-
-    @Test
-    void existsById_returns_false_when_geschichte_does_not_exist() {
-        UUID id = UUID.randomUUID();
-        when(geschichteRepository.existsById(id)).thenReturn(false);
-
-        assertThat(geschichteQueryService.existsById(id)).isFalse();
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceIntegrationTest.java

@@ -8,12 +8,9 @@ import org.raddatz.familienarchiv.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.user.AppUser;
 import org.raddatz.familienarchiv.geschichte.Geschichte;
 import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
-import org.raddatz.familienarchiv.geschichte.GeschichteType;
-import org.raddatz.familienarchiv.geschichte.GeschichteView;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.user.AppUserRepository;
 import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemService;
 import org.raddatz.familienarchiv.person.PersonRepository;
 import org.raddatz.familienarchiv.security.Permission;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +39,6 @@ class GeschichteServiceIntegrationTest {
     S3Client s3Client;
 
     @Autowired GeschichteService geschichteService;
-    @Autowired JourneyItemService journeyItemService;
     @Autowired GeschichteRepository geschichteRepository;
     @Autowired PersonRepository personRepository;
     @Autowired AppUserRepository appUserRepository;
@@ -80,11 +76,11 @@ class GeschichteServiceIntegrationTest {
                 + "<script>alert('xss')</script>");
         dto.setPersonIds(List.of(franz.getId()));
 
-        GeschichteView created = geschichteService.create(dto);
+        Geschichte created = geschichteService.create(dto);
 
-        assertThat(created.id()).isNotNull();
-        assertThat(created.status()).isEqualTo(GeschichteStatus.DRAFT);
-        assertThat(created.body())
+        assertThat(created.getId()).isNotNull();
+        assertThat(created.getStatus()).isEqualTo(GeschichteStatus.DRAFT);
+        assertThat(created.getBody())
                 .contains("<strong>jeden Sonntag</strong>")
                 .doesNotContain("<script>");
 
@@ -93,7 +89,7 @@ class GeschichteServiceIntegrationTest {
         assertThat(geschichteService.list(null, List.of(), null, 50)).isEmpty();
 
         // Reader cannot fetch DRAFT by id (404 via GESCHICHTE_NOT_FOUND)
-        UUID draftId = created.id();
+        UUID draftId = created.getId();
         org.assertj.core.api.Assertions.assertThatThrownBy(() -> geschichteService.getById(draftId))
                 .hasMessageContaining("not found");
 
@@ -101,17 +97,16 @@ class GeschichteServiceIntegrationTest {
         authenticateAs(writer, Permission.BLOG_WRITE);
         GeschichteUpdateDTO publishDto = new GeschichteUpdateDTO();
         publishDto.setStatus(GeschichteStatus.PUBLISHED);
-        GeschichteView publishedGesch = geschichteService.update(draftId, publishDto);
-        assertThat(publishedGesch.publishedAt()).isNotNull();
+        Geschichte publishedGesch = geschichteService.update(draftId, publishDto);
+        assertThat(publishedGesch.getPublishedAt()).isNotNull();
 
         // Reader can now see and fetch it
         authenticateAs(reader, Permission.READ_ALL);
         assertThat(geschichteService.list(null, List.of(), null, 50)).hasSize(1);
         assertThat(geschichteService.list(null, List.of(franz.getId()), null, 50)).hasSize(1);
         Geschichte fetched = geschichteService.getById(draftId);
-        GeschichteView fetchedView = geschichteService.toView(fetched, journeyItemService.getItems(draftId));
-        assertThat(fetchedView.title()).isEqualTo("Erinnerung an Opa Franz");
-        assertThat(fetchedView.persons()).extracting(GeschichteView.PersonView::id).containsExactly(franz.getId());
+        assertThat(fetched.getTitle()).isEqualTo("Erinnerung an Opa Franz");
+        assertThat(fetched.getPersons()).extracting(Person::getId).containsExactly(franz.getId());
 
         // Delete as writer; join rows go with it
         authenticateAs(writer, Permission.BLOG_WRITE);
@@ -142,17 +137,17 @@ class GeschichteServiceIntegrationTest {
 
         // No filter → all three
         assertThat(geschichteService.list(null, List.of(), null, 50))
-                .extracting(GeschichteSummary::getId)
+                .extracting(Geschichte::getId)
                 .containsExactlyInAnyOrder(storyAB, storyAC, storyA);
 
         // Single filter (Anna) → all three
         assertThat(geschichteService.list(null, List.of(a.getId()), null, 50))
-                .extracting(GeschichteSummary::getId)
+                .extracting(Geschichte::getId)
                 .containsExactlyInAnyOrder(storyAB, storyAC, storyA);
 
         // AND: Anna AND Bertha → only the AB story (NOT story_A, NOT story_AC)
         assertThat(geschichteService.list(null, List.of(a.getId(), b.getId()), null, 50))
-                .extracting(GeschichteSummary::getId)
+                .extracting(Geschichte::getId)
                 .containsExactly(storyAB);
 
         // AND: Bertha AND Carl → none (no story has both)
@@ -179,7 +174,7 @@ class GeschichteServiceIntegrationTest {
         geschichteService.create(dto);
 
         authenticateAs(writer2, Permission.BLOG_WRITE);
-        List<GeschichteSummary> result = geschichteService.list(GeschichteStatus.DRAFT, List.of(), null, 50);
+        List<Geschichte> result = geschichteService.list(GeschichteStatus.DRAFT, List.of(), null, 50);
 
         assertThat(result).isEmpty();
     }
@@ -190,7 +185,7 @@ class GeschichteServiceIntegrationTest {
         dto.setBody("<p>body</p>");
         dto.setPersonIds(personIds);
         dto.setStatus(GeschichteStatus.PUBLISHED);
-        return geschichteService.create(dto).id();
+        return geschichteService.create(dto).getId();
     }
 
     private void authenticateAs(AppUser user, Permission... permissions) {

backend/src/test/java/org/raddatz/familienarchiv/geschichte/GeschichteServiceTest.java

@@ -2,28 +2,31 @@ package org.raddatz.familienarchiv.geschichte;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 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.geschichte.GeschichteUpdateDTO;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemService;
-import org.raddatz.familienarchiv.geschichte.journeyitem.JourneyItemView;
 import org.raddatz.familienarchiv.user.AppUser;
+import org.raddatz.familienarchiv.document.Document;
+import org.raddatz.familienarchiv.geschichte.Geschichte;
+import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
 import org.raddatz.familienarchiv.person.Person;
+import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
 import org.raddatz.familienarchiv.security.Permission;
 import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.person.PersonService;
 import org.raddatz.familienarchiv.user.UserService;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -34,11 +37,7 @@ import java.util.stream.Collectors;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -46,13 +45,17 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class GeschichteServiceTest {
 
-    @Mock GeschichteRepository geschichteRepository;
-    @Mock PersonService personService;
-    @Mock DocumentService documentService;
-    @Mock UserService userService;
-    @Mock JourneyItemService journeyItemService;
+    @Mock
+    GeschichteRepository geschichteRepository;
+    @Mock
+    PersonService personService;
+    @Mock
+    DocumentService documentService;
+    @Mock
+    UserService userService;
 
-    @InjectMocks GeschichteService geschichteService;
+    @InjectMocks
+    GeschichteService geschichteService;
 
     AppUser writer;
     AppUser reader;
@@ -93,8 +96,7 @@ class GeschichteServiceTest {
 
         Geschichte result = geschichteService.getById(id);
 
-        assertThat(result.getId()).isEqualTo(id);
-        assertThat(result.getStatus()).isEqualTo(GeschichteStatus.DRAFT);
+        assertThat(result).isSameAs(draft);
     }
 
     @Test
@@ -106,8 +108,7 @@ class GeschichteServiceTest {
 
         Geschichte result = geschichteService.getById(id);
 
-        assertThat(result.getId()).isEqualTo(id);
-        assertThat(result.getStatus()).isEqualTo(GeschichteStatus.PUBLISHED);
+        assertThat(result).isSameAs(published);
     }
 
     @Test
@@ -122,207 +123,83 @@ class GeschichteServiceTest {
                 .isEqualTo(ErrorCode.GESCHICHTE_NOT_FOUND);
     }
 
-    // ─── getView ──────────────────────────────────────────────────────────────
-
-    @Test
-    void getView_returns_assembled_view_and_delegates_to_journeyItemService() {
-        authenticateAs(reader, Permission.READ_ALL);
-        UUID id = UUID.randomUUID();
-        Geschichte published = published(id);
-        JourneyItemView item = new JourneyItemView(UUID.randomUUID(), 10, null, "Note");
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(published));
-        when(journeyItemService.getItems(id)).thenReturn(List.of(item));
-
-        GeschichteView view = geschichteService.getView(id);
-
-        assertThat(view.id()).isEqualTo(id);
-        assertThat(view.items()).containsExactly(item);
-        verify(journeyItemService).getItems(id);
-    }
-
-    @Test
-    void getView_throws_NOT_FOUND_when_id_unknown() {
-        authenticateAs(reader, Permission.READ_ALL);
-        UUID id = UUID.randomUUID();
-        when(geschichteRepository.findById(id)).thenReturn(Optional.empty());
-
-        assertThatThrownBy(() -> geschichteService.getView(id))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_NOT_FOUND);
-    }
-
-    @Test
-    void toView_author_displayName_uses_firstName_lastName() {
-        UUID id = UUID.randomUUID();
-        Geschichte published = published(id);
-        published.setAuthor(AppUser.builder()
-                .id(UUID.randomUUID()).email("author@test")
-                .firstName("Hans").lastName("Raddatz").build());
-
-        GeschichteView result = geschichteService.toView(published, List.of());
-
-        assertThat(result.author().displayName()).isEqualTo("Hans Raddatz");
-    }
-
-    @Test
-    void toView_author_displayName_falls_back_to_Unbekannt_when_names_blank() {
-        UUID id = UUID.randomUUID();
-        Geschichte published = published(id);
-        published.setAuthor(AppUser.builder()
-                .id(UUID.randomUUID()).email("anon@test").build());
-
-        GeschichteView result = geschichteService.toView(published, List.of());
-
-        assertThat(result.author().displayName()).isEqualTo("[Unbekannt]");
-    }
-
-    @Test
-    void toView_author_email_is_not_in_author_view() {
-        UUID id = UUID.randomUUID();
-        Geschichte published = published(id);
-        published.setAuthor(AppUser.builder()
-                .id(UUID.randomUUID()).email("secret@test")
-                .firstName("Max").lastName("M").build());
-
-        GeschichteView result = geschichteService.toView(published, List.of());
-
-        // AuthorView exposes only id + displayName — no email field at all
-        assertThat(result.author()).isInstanceOf(GeschichteView.AuthorView.class);
-        assertThat(result.author().displayName()).doesNotContain("secret@test");
-    }
-
-    @Test
-    void toView_persons_are_mapped_to_PersonView() {
-        UUID id = UUID.randomUUID();
-        UUID personId = UUID.randomUUID();
-        Geschichte published = published(id);
-        published.setPersons(new HashSet<>(List.of(
-                Person.builder().id(personId).firstName("Franz").lastName("Raddatz").build()
-        )));
-
-        GeschichteView result = geschichteService.toView(published, List.of());
-
-        assertThat(result.persons()).hasSize(1);
-        GeschichteView.PersonView pv = result.persons().iterator().next();
-        assertThat(pv.id()).isEqualTo(personId);
-        assertThat(pv.firstName()).isEqualTo("Franz");
-        assertThat(pv.lastName()).isEqualTo("Raddatz");
-    }
-
-    @Test
-    void toView_items_are_passed_through() {
-        UUID id = UUID.randomUUID();
-        Geschichte published = published(id);
-
-        GeschichteView result = geschichteService.toView(published, List.of());
-
-        assertThat(result.items()).isEmpty();
-    }
-
     // ─── list ─────────────────────────────────────────────────────────────────
 
     @Test
     void list_forces_PUBLISHED_status_for_reader_without_BLOG_WRITE() {
         authenticateAs(reader, Permission.READ_ALL);
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
-                .thenReturn(List.of());
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
+                .thenReturn(List.of(published(UUID.randomUUID())));
 
-        geschichteService.list(null, List.of(), null, 50);
+        geschichteService.list(/*status*/ null, /*personIds*/ List.of(), /*documentId*/ null, /*limit*/ 50);
 
-        verify(geschichteRepository).findSummaries(eq(GeschichteStatus.PUBLISHED), isNull(), any(), anyLong(), any());
+        // Status pinning lives inside the Specification; we assert end-to-end behaviour
+        // in GeschichteServiceIntegrationTest. Here we just confirm the service routes
+        // through the spec-aware repository method.
+        verify(geschichteRepository).findAll(any(Specification.class), any(Sort.class));
     }
 
     @Test
-    void list_invokes_repository_findSummaries_when_filtering_by_single_personId() {
+    void list_passes_null_status_through_for_BLOG_WRITER_so_drafts_are_visible() {
+        authenticateAs(writer, Permission.BLOG_WRITE);
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
+                .thenReturn(List.of(draft(UUID.randomUUID()), published(UUID.randomUUID())));
+
+        List<Geschichte> out = geschichteService.list(null, List.of(), null, 50);
+
+        assertThat(out).hasSize(2);
+        verify(geschichteRepository).findAll(any(Specification.class), any(Sort.class));
+    }
+
+    @Test
+    void list_invokes_repository_findAll_when_filtering_by_single_personId() {
         authenticateAs(reader, Permission.READ_ALL);
         UUID personId = UUID.randomUUID();
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
                 .thenReturn(List.of());
 
         geschichteService.list(null, List.of(personId), null, 50);
 
-        verify(geschichteRepository).findSummaries(any(), any(), any(), anyLong(), any());
+        verify(geschichteRepository).findAll(any(Specification.class), any(Sort.class));
     }
 
     @Test
-    void list_invokes_repository_findSummaries_when_filtering_by_multiple_personIds() {
+    void list_invokes_repository_findAll_when_filtering_by_multiple_personIds() {
         authenticateAs(reader, Permission.READ_ALL);
         UUID a = UUID.randomUUID();
         UUID b = UUID.randomUUID();
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
                 .thenReturn(List.of());
 
         geschichteService.list(null, List.of(a, b), null, 50);
 
-        verify(geschichteRepository).findSummaries(any(), any(), any(), anyLong(), any());
+        verify(geschichteRepository).findAll(any(Specification.class), any(Sort.class));
     }
 
     @Test
-    void list_passes_documentId_to_repository_as_journey_item_filter() {
+    void list_filters_by_documentId() {
         authenticateAs(reader, Permission.READ_ALL);
         UUID documentId = UUID.randomUUID();
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
                 .thenReturn(List.of());
 
         geschichteService.list(null, List.of(), documentId, 50);
 
-        verify(geschichteRepository).findSummaries(any(), any(), any(), anyLong(), eq(documentId));
+        verify(geschichteRepository).findAll(any(Specification.class), any(Sort.class));
     }
 
     @Test
-    void list_passes_nil_uuid_sentinel_to_repository_when_no_person_filter_given() {
-        // B2: when personIds is empty/null the service must pass a sentinel NIL UUID
-        // so the IN() predicate is skipped without producing invalid empty-IN() SQL.
+    void list_caps_limit_at_max_via_pageable_when_caller_passes_huge_value() {
         authenticateAs(reader, Permission.READ_ALL);
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
-                .thenReturn(List.of());
+        when(geschichteRepository.findAll(any(Specification.class), any(Sort.class)))
+                .thenReturn(List.of(published(UUID.randomUUID())));
 
-        geschichteService.list(null, List.of(), null, 50);
-
-        UUID nilUUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
-        verify(geschichteRepository).findSummaries(
-                any(), any(), org.mockito.ArgumentMatchers.argThat(ids -> ids.contains(nilUUID)), anyLong(), any());
-    }
-
-    @Test
-    void list_caps_limit_at_max_when_caller_passes_huge_value() {
-        authenticateAs(reader, Permission.READ_ALL);
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
-                .thenReturn(List.of(mock(GeschichteSummary.class)));
-
-        List<GeschichteSummary> out = geschichteService.list(null, List.of(), null, 9999);
+        // 9999 should be clamped — service trims to MAX_LIMIT (200) before/after the query
+        List<Geschichte> out = geschichteService.list(null, List.of(), null, 9999);
 
         assertThat(out).hasSizeLessThanOrEqualTo(200);
     }
 
-    @Test
-    @DisplayName("security: null status for blog writer returns PUBLISHED, never leaks drafts")
-    void list_with_blog_writer_and_null_status_returns_PUBLISHED_not_all_drafts() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
-                .thenReturn(List.of());
-
-        geschichteService.list(null, List.of(), null, 50);
-
-        verify(geschichteRepository).findSummaries(
-                eq(GeschichteStatus.PUBLISHED), isNull(), any(), anyLong(), any());
-    }
-
-    @Test
-    @DisplayName("security: DRAFT status scopes to current user only")
-    void list_with_DRAFT_status_scopes_to_current_user_not_all_authors() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.findSummaries(any(), any(), any(), anyLong(), any()))
-                .thenReturn(List.of());
-
-        geschichteService.list(GeschichteStatus.DRAFT, List.of(), null, 50);
-
-        verify(geschichteRepository).findSummaries(
-                eq(GeschichteStatus.DRAFT), eq(writer.getId()), any(), anyLong(), any());
-    }
-
     // ─── create ──────────────────────────────────────────────────────────────
 
     @Test
@@ -336,11 +213,11 @@ class GeschichteServiceTest {
         dto.setTitle("My Story");
         dto.setBody("<p>plain text</p>");
 
-        GeschichteView saved = geschichteService.create(dto);
+        Geschichte saved = geschichteService.create(dto);
 
-        assertThat(saved.status()).isEqualTo(GeschichteStatus.DRAFT);
-        assertThat(saved.publishedAt()).isNull();
-        assertThat(saved.author().id()).isEqualTo(writer.getId());
+        assertThat(saved.getStatus()).isEqualTo(GeschichteStatus.DRAFT);
+        assertThat(saved.getPublishedAt()).isNull();
+        assertThat(saved.getAuthor()).isSameAs(writer);
     }
 
     @Test
@@ -354,9 +231,9 @@ class GeschichteServiceTest {
         dto.setTitle("XSS attempt");
         dto.setBody("<p>safe</p><script>alert(1)</script><img src=x onerror=alert(2)>");
 
-        GeschichteView saved = geschichteService.create(dto);
+        Geschichte saved = geschichteService.create(dto);
 
-        assertThat(saved.body())
+        assertThat(saved.getBody())
                 .contains("<p>safe</p>")
                 .doesNotContain("<script>")
                 .doesNotContain("onerror")
@@ -375,9 +252,9 @@ class GeschichteServiceTest {
         dto.setBody("<h2>Heading</h2><p>Some <strong>bold</strong> and <em>italic</em>.</p>"
                 + "<ul><li>one</li></ul><ol><li>first</li></ol>");
 
-        GeschichteView saved = geschichteService.create(dto);
+        Geschichte saved = geschichteService.create(dto);
 
-        assertThat(saved.body())
+        assertThat(saved.getBody())
                 .contains("<h2>Heading</h2>")
                 .contains("<strong>bold</strong>")
                 .contains("<em>italic</em>")
@@ -400,9 +277,28 @@ class GeschichteServiceTest {
         dto.setTitle("Linked");
         dto.setPersonIds(List.of(personId));
 
-        GeschichteView saved = geschichteService.create(dto);
+        Geschichte saved = geschichteService.create(dto);
 
-        assertThat(saved.persons()).extracting(GeschichteView.PersonView::id).containsExactly(personId);
+        assertThat(saved.getPersons()).containsExactly(person);
+    }
+
+    @Test
+    void create_resolves_documentIds_via_DocumentService() {
+        authenticateAs(writer, Permission.BLOG_WRITE);
+        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
+        UUID docId = UUID.randomUUID();
+        Document doc = Document.builder().id(docId).build();
+        when(documentService.getDocumentById(docId)).thenReturn(doc);
+        when(geschichteRepository.save(any(Geschichte.class)))
+                .thenAnswer(inv -> inv.getArgument(0));
+
+        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
+        dto.setTitle("Linked doc");
+        dto.setDocumentIds(List.of(docId));
+
+        Geschichte saved = geschichteService.create(dto);
+
+        assertThat(saved.getDocuments()).containsExactly(doc);
     }
 
     @Test
@@ -419,202 +315,6 @@ class GeschichteServiceTest {
                 .isEqualTo(ErrorCode.VALIDATION_ERROR);
     }
 
-    @Test
-    void create_preserves_JOURNEY_type_from_dto() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("My Journey");
-        dto.setType(GeschichteType.JOURNEY);
-
-        GeschichteView saved = geschichteService.create(dto);
-
-        assertThat(saved.type()).isEqualTo(GeschichteType.JOURNEY);
-    }
-
-    @Test
-    void create_defaults_to_STORY_when_type_is_null() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("My Story");
-
-        GeschichteView saved = geschichteService.create(dto);
-
-        assertThat(saved.type()).isEqualTo(GeschichteType.STORY);
-    }
-
-    @Test
-    void create_stores_JOURNEY_intro_verbatim_without_html_entity_encoding() {
-        // The journey intro is plain text: JourneyReader renders it via Svelte text
-        // interpolation (never {@html}), so the OWASP sanitizer's entity encoding
-        // would corrupt real content ("Müller & Söhne" → "Müller &amp; Söhne") and
-        // re-encode cumulatively on every editor round-trip.
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("Winterbriefe");
-        dto.setType(GeschichteType.JOURNEY);
-        dto.setBody("Müller & Söhne, Temperatur < 0");
-
-        GeschichteView saved = geschichteService.create(dto);
-
-        assertThat(saved.body()).isEqualTo("Müller & Söhne, Temperatur < 0");
-    }
-
-    @Test
-    void update_stores_JOURNEY_intro_verbatim_without_html_entity_encoding() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.JOURNEY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setBody("Temperatur < 0 & Schnee");
-
-        GeschichteView saved = geschichteService.update(id, dto);
-
-        assertThat(saved.body()).isEqualTo("Temperatur < 0 & Schnee");
-    }
-
-    @Test
-    void update_still_sanitizes_STORY_body() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.STORY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setBody("<p>ok</p><script>alert(1)</script>");
-
-        GeschichteView saved = geschichteService.update(id, dto);
-
-        assertThat(saved.body()).doesNotContain("<script>").contains("<p>ok</p>");
-    }
-
-    // ─── length caps ─────────────────────────────────────────────────────────
-
-    @Test
-    void create_rejects_title_longer_than_255_with_GESCHICHTE_TITLE_TOO_LONG() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("x".repeat(256));
-
-        assertThatThrownBy(() -> geschichteService.create(dto))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_TITLE_TOO_LONG);
-    }
-
-    @Test
-    void create_accepts_title_of_exactly_255_chars() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("x".repeat(255));
-
-        assertThat(geschichteService.create(dto).title()).hasSize(255);
-    }
-
-    @Test
-    void update_rejects_title_longer_than_255_with_GESCHICHTE_TITLE_TOO_LONG() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(draft(id)));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("x".repeat(256));
-
-        assertThatThrownBy(() -> geschichteService.update(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_TITLE_TOO_LONG);
-    }
-
-    @Test
-    void create_rejects_JOURNEY_intro_longer_than_4000_with_GESCHICHTE_INTRO_TOO_LONG() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("Winterbriefe");
-        dto.setType(GeschichteType.JOURNEY);
-        dto.setBody("x".repeat(4001));
-
-        assertThatThrownBy(() -> geschichteService.create(dto))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_INTRO_TOO_LONG);
-    }
-
-    @Test
-    void create_accepts_JOURNEY_intro_of_exactly_4000_chars() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        when(userService.findByEmail(writer.getEmail())).thenReturn(writer);
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setTitle("Winterbriefe");
-        dto.setType(GeschichteType.JOURNEY);
-        dto.setBody("x".repeat(4000));
-
-        assertThat(geschichteService.create(dto).body()).hasSize(4000);
-    }
-
-    @Test
-    void update_rejects_JOURNEY_intro_longer_than_4000_with_GESCHICHTE_INTRO_TOO_LONG() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.JOURNEY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setBody("x".repeat(4001));
-
-        assertThatThrownBy(() -> geschichteService.update(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_INTRO_TOO_LONG);
-    }
-
-    @Test
-    void update_does_not_apply_the_intro_cap_to_STORY_bodies() {
-        // STORY bodies are sanitized Tiptap HTML and intentionally unbounded —
-        // the 4000-char cap exists for the verbatim JOURNEY intro path only.
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.STORY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setBody("<p>" + "x".repeat(4001) + "</p>");
-
-        assertThat(geschichteService.update(id, dto).body()).contains("<p>");
-    }
-
     // ─── update ──────────────────────────────────────────────────────────────
 
     @Test
@@ -630,10 +330,10 @@ class GeschichteServiceTest {
         GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
         dto.setStatus(GeschichteStatus.PUBLISHED);
 
-        GeschichteView saved = geschichteService.update(id, dto);
+        Geschichte saved = geschichteService.update(id, dto);
 
-        assertThat(saved.status()).isEqualTo(GeschichteStatus.PUBLISHED);
-        assertThat(saved.publishedAt()).isNotNull();
+        assertThat(saved.getStatus()).isEqualTo(GeschichteStatus.PUBLISHED);
+        assertThat(saved.getPublishedAt()).isNotNull();
     }
 
     @Test
@@ -649,10 +349,10 @@ class GeschichteServiceTest {
         GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
         dto.setStatus(GeschichteStatus.DRAFT);
 
-        GeschichteView saved = geschichteService.update(id, dto);
+        Geschichte saved = geschichteService.update(id, dto);
 
-        assertThat(saved.status()).isEqualTo(GeschichteStatus.DRAFT);
-        assertThat(saved.publishedAt()).isNull();
+        assertThat(saved.getStatus()).isEqualTo(GeschichteStatus.DRAFT);
+        assertThat(saved.getPublishedAt()).isNull();
     }
 
     @Test
@@ -666,46 +366,9 @@ class GeschichteServiceTest {
         GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
         dto.setBody("<p>ok</p><script>alert(1)</script>");
 
-        GeschichteView saved = geschichteService.update(id, dto);
+        Geschichte saved = geschichteService.update(id, dto);
 
-        assertThat(saved.body()).doesNotContain("<script>").contains("<p>ok</p>");
-    }
-
-    @Test
-    void update_rejects_type_change_with_409_GESCHICHTE_TYPE_IMMUTABLE() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.STORY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setType(GeschichteType.JOURNEY);
-
-        assertThatThrownBy(() -> geschichteService.update(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting("code")
-                .isEqualTo(ErrorCode.GESCHICHTE_TYPE_IMMUTABLE);
-    }
-
-    @Test
-    void update_accepts_dto_carrying_the_unchanged_type() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        UUID id = UUID.randomUUID();
-        Geschichte existing = draft(id);
-        existing.setType(GeschichteType.STORY);
-        when(geschichteRepository.findById(id)).thenReturn(Optional.of(existing));
-        when(geschichteRepository.save(any(Geschichte.class)))
-                .thenAnswer(inv -> inv.getArgument(0));
-
-        GeschichteUpdateDTO dto = new GeschichteUpdateDTO();
-        dto.setType(GeschichteType.STORY);
-        dto.setTitle("Unverändert getypt");
-
-        GeschichteView saved = geschichteService.update(id, dto);
-
-        assertThat(saved.type()).isEqualTo(GeschichteType.STORY);
-        assertThat(saved.title()).isEqualTo("Unverändert getypt");
+        assertThat(saved.getBody()).doesNotContain("<script>").contains("<p>ok</p>");
     }
 
     @Test
@@ -763,7 +426,7 @@ class GeschichteServiceTest {
                 .body("<p>body</p>")
                 .status(GeschichteStatus.DRAFT)
                 .persons(new HashSet<>())
-                .items(new ArrayList<>())
+                .documents(new HashSet<>())
                 .build();
     }
 
@@ -775,7 +438,7 @@ class GeschichteServiceTest {
                 .status(GeschichteStatus.PUBLISHED)
                 .publishedAt(LocalDateTime.now().minusHours(1))
                 .persons(new HashSet<>())
-                .items(new ArrayList<>())
+                .documents(new HashSet<>())
                 .build();
     }
 }

backend/src/test/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemConstraintsTest.java

@@ -1,165 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
-import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
-import org.raddatz.familienarchiv.geschichte.GeschichteType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * Raw-SQL constraint tests for journey_items — deliberately NOT @Transactional at class level.
- * A DataIntegrityViolationException inside a class-level @Transactional marks the tx
- * rollback-only and cascades into TransactionSystemException on teardown.
- * Each test inserts via jdbcTemplate and uses explicit SQL teardown.
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-class JourneyItemConstraintsTest {
-
-    @MockitoBean
-    S3Client s3Client;
-
-    @Autowired JdbcTemplate jdbcTemplate;
-    @Autowired GeschichteRepository geschichteRepository;
-    @Autowired DocumentRepository documentRepository;
-
-    private UUID geschichteId;
-    private UUID documentId;
-
-    @BeforeEach
-    void seed() {
-        jdbcTemplate.execute("DELETE FROM journey_items");
-        Document doc = documentRepository.save(Document.builder()
-                .title("Constraints-Test-Doc")
-                .originalFilename("ct.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .build());
-        documentId = doc.getId();
-        Geschichte g = geschichteRepository.save(Geschichte.builder()
-                .title("Constraints-Test-Journey")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-        geschichteId = g.getId();
-    }
-
-    @Test
-    void unique_constraint_is_deferrable_initially_deferred() {
-        Boolean condeferrable = jdbcTemplate.queryForObject(
-                "SELECT condeferrable FROM pg_constraint WHERE conname = 'uq_journey_items_geschichte_position'",
-                Boolean.class);
-        Boolean condeferred = jdbcTemplate.queryForObject(
-                "SELECT condeferred FROM pg_constraint WHERE conname = 'uq_journey_items_geschichte_position'",
-                Boolean.class);
-        assertThat(condeferrable).as("constraint must be deferrable").isTrue();
-        assertThat(condeferred).as("constraint must be initially deferred").isTrue();
-    }
-
-    @Test
-    void unique_index_rejects_duplicate_document_per_geschichte() {
-        // Atomic backstop for the service-level dedup pre-check (check-then-insert race).
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 10, documentId);
-        assertThatThrownBy(() ->
-                jdbcTemplate.update(
-                        "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                        UUID.randomUUID(), geschichteId, 20, documentId))
-                .isInstanceOf(DataIntegrityViolationException.class);
-    }
-
-    @Test
-    void unique_index_allows_same_document_in_different_journeys() {
-        Geschichte other = geschichteRepository.save(Geschichte.builder()
-                .title("Andere Lesereise")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 10, documentId);
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), other.getId(), 10, documentId);
-        Integer count = jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM journey_items WHERE document_id = ?", Integer.class, documentId);
-        assertThat(count).isEqualTo(2);
-    }
-
-    @Test
-    void unique_index_allows_multiple_note_only_items() {
-        // document_id IS NULL rows must not collide — the index is partial.
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, note) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 10, "erste Notiz");
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, note) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 20, "zweite Notiz");
-        Integer count = jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM journey_items WHERE geschichte_id = ?", Integer.class, geschichteId);
-        assertThat(count).isEqualTo(2);
-    }
-
-    @Test
-    void note_length_check_rejects_2001_chars() {
-        assertThatThrownBy(() ->
-                jdbcTemplate.update(
-                        "INSERT INTO journey_items (id, geschichte_id, position, note) VALUES (?, ?, ?, ?)",
-                        UUID.randomUUID(), geschichteId, 10, "x".repeat(2001)))
-                .isInstanceOf(DataIntegrityViolationException.class);
-    }
-
-    @Test
-    void note_length_check_accepts_exactly_2000_chars() {
-        // Pins the boundary at the DB layer too — a future <= vs < migration edit
-        // must fail here, not only in the mock-based service test.
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, note) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 10, "x".repeat(2000));
-        Integer count = jdbcTemplate.queryForObject(
-                "SELECT COUNT(*) FROM journey_items WHERE geschichte_id = ?", Integer.class, geschichteId);
-        assertThat(count).isEqualTo(1);
-    }
-
-    @Test
-    void position_check_rejects_nonpositive() {
-        UUID itemId = UUID.randomUUID();
-        assertThatThrownBy(() ->
-                jdbcTemplate.update(
-                        "INSERT INTO journey_items (id, geschichte_id, position, note) VALUES (?, ?, ?, ?)",
-                        itemId, geschichteId, 0, "test"))
-                .isInstanceOf(DataIntegrityViolationException.class);
-    }
-
-    @Test
-    void unique_constraint_rejects_duplicate_position_per_geschichte() {
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                UUID.randomUUID(), geschichteId, 10, documentId);
-
-        assertThatThrownBy(() ->
-                jdbcTemplate.update(
-                        "INSERT INTO journey_items (id, geschichte_id, position, document_id) VALUES (?, ?, ?, ?)",
-                        UUID.randomUUID(), geschichteId, 10, documentId))
-                .isInstanceOf(DataIntegrityViolationException.class);
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemDocumentDeleteTest.java

@@ -1,261 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.audit.AuditKind;
-import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
-import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
-import org.raddatz.familienarchiv.geschichte.GeschichteType;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.AppUserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.util.List;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.verify;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-class JourneyItemDocumentDeleteTest {
-
-    @MockitoBean
-    S3Client s3Client;
-
-    @MockitoBean
-    AuditService auditService;
-
-    @MockitoSpyBean
-    DocumentRepository documentRepository;
-
-    @PersistenceContext
-    EntityManager em;
-
-    @Autowired DocumentService documentService;
-    @Autowired JourneyItemRepository journeyItemRepository;
-    @Autowired GeschichteRepository geschichteRepository;
-    @Autowired DocumentRepository docRepo;
-    @Autowired AppUserRepository appUserRepository;
-    @Autowired JdbcTemplate jdbcTemplate;
-
-    Geschichte journey;
-    Document doc;
-    AppUser writer;
-
-    @BeforeEach
-    void seed() {
-        writer = appUserRepository.save(AppUser.builder()
-                .email("delete-test-writer@test")
-                .password("hash")
-                .build());
-        doc = docRepo.save(Document.builder()
-                .title("Testbrief")
-                .originalFilename("testbrief.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .build());
-        journey = geschichteRepository.save(Geschichte.builder()
-                .title("Eine Lesereise")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-        SecurityContextHolder.getContext().setAuthentication(
-                new UsernamePasswordAuthenticationToken(writer.getEmail(), null,
-                        List.of(new SimpleGrantedAuthority("BLOG_WRITE"))));
-    }
-
-    @AfterEach
-    void cleanup() {
-        SecurityContextHolder.clearContext();
-        reset(documentRepository);
-        // Deletion order is FK-load-bearing: journey_items reference both documents
-        // and geschichten, so children must be removed before their parents.
-        journeyItemRepository.deleteAll();
-        docRepo.deleteAll();
-        geschichteRepository.deleteAll();
-        appUserRepository.deleteAll();
-    }
-
-    // ─── AC-1: headline ───────────────────────────────────────────────────────
-
-    @Test
-    void deleting_document_linked_via_note_less_item_deletes_item_not_500() {
-        JourneyItem item = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).document(doc).build());
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-
-        assertThat(journeyItemRepository.findById(item.getId())).isEmpty();
-        assertThat(docRepo.findById(doc.getId())).isEmpty();
-    }
-
-    // ─── AC-2: note-carrying item survives as placeholder ─────────────────────
-
-    @Test
-    void deleting_document_preserves_note_carrying_item_as_placeholder() {
-        JourneyItem item = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).document(doc).note("curator context").build());
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.clear();
-
-        JourneyItem surviving = journeyItemRepository.findById(item.getId()).orElseThrow();
-        assertThat(surviving.getDocumentId()).isNull();
-        assertThat(surviving.getNote()).isEqualTo("curator context");
-    }
-
-    // ─── AC-3: note-only item untouched ───────────────────────────────────────
-
-    @Test
-    void deleting_document_does_not_affect_note_only_item() {
-        JourneyItem noteOnly = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).note("Einleitung").build());
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.clear();
-
-        JourneyItem reloaded = journeyItemRepository.findById(noteOnly.getId()).orElseThrow();
-        assertThat(reloaded.getDocumentId()).isNull();
-        assertThat(reloaded.getNote()).isEqualTo("Einleitung");
-    }
-
-    // ─── AC-4: asymmetric multi-journey ───────────────────────────────────────
-
-    @Test
-    void deleting_document_applies_independently_per_referencing_item() {
-        Geschichte journey2 = geschichteRepository.save(Geschichte.builder()
-                .title("Zweite Reise")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-
-        JourneyItem noteLess = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).document(doc).build());
-        JourneyItem noteCarrying = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey2).position(10).document(doc).note("Begleittext").build());
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.clear();
-
-        assertThat(journeyItemRepository.findById(noteLess.getId())).isEmpty();
-        JourneyItem surviving = journeyItemRepository.findById(noteCarrying.getId()).orElseThrow();
-        assertThat(surviving.getDocumentId()).isNull();
-        assertThat(surviving.getNote()).isEqualTo("Begleittext");
-    }
-
-    // ─── AC-5: rollback guard ─────────────────────────────────────────────────
-
-    @Test
-    void listener_deletes_roll_back_when_document_delete_fails() {
-        JourneyItem item = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).document(doc).build());
-        em.clear();
-
-        doThrow(new RuntimeException("simulated failure"))
-                .when(documentRepository).deleteById(any());
-
-        assertThatThrownBy(() -> documentService.deleteDocument(doc.getId(), writer.getId()))
-                .isInstanceOf(RuntimeException.class);
-
-        em.clear();
-        assertThat(journeyItemRepository.findById(item.getId())).isPresent();
-    }
-
-    // ─── AC-6: empty-string note boundary ────────────────────────────────────
-
-    @Test
-    void empty_string_note_item_is_cascaded_whitespace_only_note_is_preserved() {
-        // uq_journey_items_geschichte_document prevents two items with the same
-        // (geschichte_id, document_id) in one journey — use two separate journeys.
-        Geschichte journey2 = geschichteRepository.save(Geschichte.builder()
-                .title("Zweite Reise für AC-6")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-
-        UUID emptyNoteItemId = UUID.randomUUID();
-        UUID whitespaceNoteItemId = UUID.randomUUID();
-
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id, note) VALUES (?,?,?,?,?)",
-                emptyNoteItemId, journey.getId(), 10, doc.getId(), "");
-        jdbcTemplate.update(
-                "INSERT INTO journey_items (id, geschichte_id, position, document_id, note) VALUES (?,?,?,?,?)",
-                whitespaceNoteItemId, journey2.getId(), 20, doc.getId(), "   ");
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.clear();
-
-        assertThat(journeyItemRepository.findById(emptyNoteItemId)).isEmpty();
-        JourneyItem whitespaceItem = journeyItemRepository.findById(whitespaceNoteItemId).orElseThrow();
-        assertThat(whitespaceItem.getDocumentId()).isNull();
-        assertThat(whitespaceItem.getNote()).isEqualTo("   ");
-    }
-
-    // ─── Idempotency / no-collateral ──────────────────────────────────────────
-
-    @Test
-    void deleting_document_in_zero_journeys_returns_no_collateral() {
-        Document unlinked = docRepo.save(Document.builder()
-                .title("Unverknüpfter Brief")
-                .originalFilename("other.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .build());
-        JourneyItem unrelated = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).note("unrelated note").build());
-        em.clear();
-
-        documentService.deleteDocument(unlinked.getId(), writer.getId());
-        em.clear();
-
-        assertThat(docRepo.findById(unlinked.getId())).isEmpty();
-        assertThat(journeyItemRepository.findById(unrelated.getId())).isPresent();
-        assertThat(journeyItemRepository.count()).isEqualTo(1);
-    }
-
-    // ─── AC-7: audit — DOCUMENT_DELETED emitted, JOURNEY_ITEM_REMOVED absent ─
-
-    @Test
-    void deleting_document_emits_document_audit_but_no_journey_item_audit() {
-        journeyItemRepository.save(
-                JourneyItem.builder().geschichte(journey).position(10).document(doc).build());
-        em.clear();
-
-        documentService.deleteDocument(doc.getId(), writer.getId());
-
-        verify(auditService).logAfterCommit(eq(AuditKind.DOCUMENT_DELETED), eq(writer.getId()), eq(doc.getId()), any());
-        verify(auditService, never()).logAfterCommit(eq(AuditKind.JOURNEY_ITEM_REMOVED), any(), any(), any());
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemIntegrationTest.java

@@ -1,418 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-import org.raddatz.familienarchiv.geschichte.GeschichteRepository;
-import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
-import org.raddatz.familienarchiv.geschichte.GeschichteType;
-import org.raddatz.familienarchiv.security.Permission;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.AppUserRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.transaction.annotation.Transactional;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.util.List;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-@Transactional
-class JourneyItemIntegrationTest {
-
-    @MockitoBean
-    S3Client s3Client;
-
-    @MockitoBean
-    AuditService auditService;
-
-    @PersistenceContext
-    EntityManager em;
-
-    @Autowired GeschichteRepository geschichteRepository;
-    @Autowired JourneyItemRepository journeyItemRepository;
-    @Autowired JourneyItemService journeyItemService;
-    @Autowired DocumentService documentService;
-    @Autowired DocumentRepository documentRepository;
-    @Autowired AppUserRepository appUserRepository;
-
-    Geschichte journey;
-    Document doc;
-    AppUser writer;
-
-    @BeforeEach
-    void seed() {
-        writer = appUserRepository.save(AppUser.builder()
-                .email("journey-writer@test")
-                .password("hash")
-                .build());
-        doc = documentRepository.save(Document.builder()
-                .title("Testbrief")
-                .originalFilename("testbrief.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .build());
-        journey = geschichteRepository.save(Geschichte.builder()
-                .title("Eine Lesereise")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.JOURNEY)
-                .build());
-        em.flush();
-        em.clear();
-    }
-
-    @AfterEach
-    void clearSecurity() {
-        SecurityContextHolder.clearContext();
-    }
-
-    private void authenticateAs(AppUser user, Permission... permissions) {
-        var authorities = java.util.Arrays.stream(permissions)
-                .map(p -> new SimpleGrantedAuthority(p.name()))
-                .toList();
-        SecurityContextHolder.getContext().setAuthentication(
-                new UsernamePasswordAuthenticationToken(user.getEmail(), null, authorities));
-    }
-
-    // ─── @OrderBy ─────────────────────────────────────────────────────────────
-
-    @Test
-    void items_are_returned_in_position_order_regardless_of_insertion_order() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-
-        // Distinct content per item — V74's partial unique index forbids the same
-        // document twice in one journey, and ordering doesn't depend on it.
-        JourneyItem third = JourneyItem.builder().geschichte(managed).position(3000).document(doc).build();
-        JourneyItem first = JourneyItem.builder().geschichte(managed).position(1000).note("erstes").build();
-        JourneyItem second = JourneyItem.builder().geschichte(managed).position(2000).note("zweites").build();
-        managed.getItems().addAll(List.of(third, first, second));
-        geschichteRepository.save(managed);
-        em.flush();
-        em.clear();
-
-        Geschichte reloaded = geschichteRepository.findById(journey.getId()).orElseThrow();
-        List<Integer> positions = reloaded.getItems().stream().map(JourneyItem::getPosition).toList();
-
-        assertThat(positions).containsExactly(1000, 2000, 3000);
-    }
-
-    // ─── Cascade ALL + orphanRemoval ──────────────────────────────────────────
-
-    @Test
-    void deleting_geschichte_cascade_deletes_all_journey_items() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        managed.getItems().add(JourneyItem.builder().geschichte(managed).position(1000).document(doc).build());
-        managed.getItems().add(JourneyItem.builder().geschichte(managed).position(2000).note("context").build());
-        geschichteRepository.save(managed);
-        em.flush();
-        em.clear();
-
-        UUID geschichteId = journey.getId();
-        geschichteRepository.deleteById(geschichteId);
-        em.flush();
-
-        assertThat(journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId)).isEmpty();
-    }
-
-    @Test
-    void removing_item_from_items_list_triggers_orphan_removal() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        JourneyItem item = JourneyItem.builder().geschichte(managed).position(1000).document(doc).build();
-        managed.getItems().add(item);
-        Geschichte saved = geschichteRepository.save(managed);
-        em.flush();
-        UUID itemId = saved.getItems().get(0).getId(); // extract before clear
-        em.clear();
-        Geschichte reloaded = geschichteRepository.findById(journey.getId()).orElseThrow();
-        reloaded.getItems().removeIf(i -> i.getId().equals(itemId));
-        geschichteRepository.save(reloaded);
-        em.flush();
-
-        assertThat(journeyItemRepository.findById(itemId)).isEmpty();
-    }
-
-    // ─── GeschichteType round-trip ────────────────────────────────────────────
-
-    @Test
-    void type_persists_as_JOURNEY_and_roundtrips() {
-        Geschichte reloaded = geschichteRepository.findById(journey.getId()).orElseThrow();
-        assertThat(reloaded.getType()).isEqualTo(GeschichteType.JOURNEY);
-    }
-
-    @Test
-    void type_defaults_to_STORY_for_new_geschichten() {
-        Geschichte story = geschichteRepository.save(Geschichte.builder()
-                .title("Erinnerung")
-                .status(GeschichteStatus.DRAFT)
-                .build());
-        em.flush();
-        em.clear();
-
-        Geschichte reloaded = geschichteRepository.findById(story.getId()).orElseThrow();
-        assertThat(reloaded.getType()).isEqualTo(GeschichteType.STORY);
-    }
-
-    // ─── Note-only item (document_id IS NULL) ─────────────────────────────────
-
-    @Test
-    void note_only_item_persists_without_document() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        JourneyItem note = JourneyItem.builder()
-                .geschichte(managed).position(1000).note("Eine kurze Einleitung.").build();
-        managed.getItems().add(note);
-        Geschichte saved = geschichteRepository.save(managed);
-        em.flush();
-        UUID noteId = saved.getItems().get(0).getId(); // extract before clear
-        em.clear();
-        JourneyItem reloaded = journeyItemRepository.findById(noteId).orElseThrow();
-        assertThat(reloaded.getDocumentId()).isNull();
-        assertThat(reloaded.getNote()).isEqualTo("Eine kurze Einleitung.");
-    }
-
-    // ─── Document-backed item exposes documentId ──────────────────────────────
-
-    @Test
-    void document_backed_item_exposes_document_uuid_via_getDocumentId() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        JourneyItem item = JourneyItem.builder()
-                .geschichte(managed).position(1000).document(doc).build();
-        managed.getItems().add(item);
-        Geschichte saved = geschichteRepository.save(managed);
-        em.flush();
-        UUID itemId = saved.getItems().get(0).getId(); // extract before clear
-        em.clear();
-        JourneyItem reloaded = journeyItemRepository.findById(itemId).orElseThrow();
-        assertThat(reloaded.getDocumentId()).isEqualTo(doc.getId());
-    }
-
-    // ─── ON DELETE SET NULL ───────────────────────────────────────────────────
-
-    @Test
-    void deleting_document_sets_item_document_to_null_not_delete_item() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        JourneyItem item = JourneyItem.builder()
-                .geschichte(managed).position(1000).document(doc).note("still here").build();
-        managed.getItems().add(item);
-        Geschichte saved = geschichteRepository.save(managed);
-        em.flush();
-        UUID itemId = saved.getItems().get(0).getId(); // extract before clear
-        em.clear();
-
-        // Route through service so the DocumentDeletingEvent fires and the listener
-        // removes note-less items before ON DELETE SET NULL acts on note-carrying rows.
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.flush();
-        em.clear();
-
-        JourneyItem surviving = journeyItemRepository.findById(itemId).orElseThrow();
-        assertThat(surviving.getDocumentId()).isNull();
-        assertThat(surviving.getNote()).isEqualTo("still here");
-    }
-
-    // ─── CHECK constraint: document_id IS NOT NULL OR note IS NOT NULL ─────────
-
-    @Test
-    void saving_item_with_neither_document_nor_note_violates_check_constraint() {
-        Geschichte managed = geschichteRepository.findById(journey.getId()).orElseThrow();
-        JourneyItem empty = JourneyItem.builder()
-                .geschichte(managed).position(1000).build();
-
-        assertThatThrownBy(() -> {
-            journeyItemRepository.save(empty);
-            journeyItemRepository.flush();
-        }).isInstanceOf(Exception.class);
-    }
-
-    // ─── JourneyItemService.append — end-to-end persistence ──────────────────
-
-    @Test
-    void append_persists_item_at_position_10() {
-        // Arrange: authenticate as a user with BLOG_WRITE
-        authenticateAs(writer, Permission.BLOG_WRITE);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("First stop");
-
-        // Act
-        JourneyItemView view = journeyItemService.append(journey.getId(), dto);
-        em.flush();
-        em.clear();
-
-        // Assert: item exists in DB at position 10
-        assertThat(view.position()).isEqualTo(10);
-        assertThat(view.note()).isEqualTo("First stop");
-        List<JourneyItem> persisted = journeyItemRepository.findByGeschichteIdOrderByPosition(journey.getId());
-        assertThat(persisted).hasSize(1);
-        assertThat(persisted.get(0).getPosition()).isEqualTo(10);
-        assertThat(persisted.get(0).getNote()).isEqualTo("First stop");
-    }
-
-    @Test
-    void append_document_persists_and_rejects_duplicate() {
-        // Covers the document branch of append, including the duplicate guard —
-        // the derived exists query must resolve document.id, which the transient
-        // getDocumentId() getter on JourneyItem shadows for Spring Data.
-        authenticateAs(writer, Permission.BLOG_WRITE);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(doc.getId());
-
-        JourneyItemView view = journeyItemService.append(journey.getId(), dto);
-        em.flush();
-        em.clear();
-
-        assertThat(view.document()).isNotNull();
-        assertThat(view.document().id()).isEqualTo(doc.getId());
-
-        JourneyItemCreateDTO duplicate = new JourneyItemCreateDTO();
-        duplicate.setDocumentId(doc.getId());
-        assertThatThrownBy(() -> journeyItemService.append(journey.getId(), duplicate))
-                .hasFieldOrPropertyWithValue("code",
-                        org.raddatz.familienarchiv.exception.ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED);
-    }
-
-    // ─── STORY-type Geschichten hold journey items (#795) ────────────────────
-
-    @Test
-    void story_type_can_hold_journey_items_through_service() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        Geschichte story = savedStory();
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(doc.getId());
-        JourneyItemView appended = journeyItemService.append(story.getId(), dto);
-        em.flush();
-        em.clear();
-
-        List<JourneyItemView> items = journeyItemService.getItems(story.getId());
-        assertThat(items).hasSize(1);
-        assertThat(items.get(0).id()).isEqualTo(appended.id());
-        assertThat(items.get(0).document().id()).isEqualTo(doc.getId());
-    }
-
-    @Test
-    void v72_migrated_story_items_keep_position_order_and_are_removable() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        Geschichte story = savedStory();
-        Document docB = documentRepository.save(Document.builder()
-                .title("Zweiter Brief").originalFilename("b.pdf").status(DocumentStatus.UPLOADED).build());
-        Document docC = documentRepository.save(Document.builder()
-                .title("Dritter Brief").originalFilename("c.pdf").status(DocumentStatus.UPLOADED).build());
-
-        // V72 inserted journey_items rows directly with position gaps — mirror that
-        // by writing through the repository instead of the service.
-        JourneyItem first = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(story).position(10).document(doc).build());
-        JourneyItem second = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(story).position(20).document(docB).build());
-        JourneyItem third = journeyItemRepository.save(
-                JourneyItem.builder().geschichte(story).position(30).document(docC).build());
-        em.flush();
-        em.clear();
-
-        assertThat(journeyItemService.getItems(story.getId()))
-                .extracting(JourneyItemView::position)
-                .containsExactly(10, 20, 30);
-
-        journeyItemService.delete(story.getId(), second.getId());
-        em.flush();
-        em.clear();
-
-        assertThat(journeyItemService.getItems(story.getId()))
-                .extracting(JourneyItemView::id)
-                .containsExactly(first.getId(), third.getId());
-    }
-
-    @Test
-    void story_item_with_deleted_document_survives_and_remains_deletable() {
-        authenticateAs(writer, Permission.BLOG_WRITE);
-        Geschichte story = savedStory();
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(doc.getId());
-        // The note keeps chk_journey_item_not_empty satisfied once ON DELETE
-        // SET NULL clears document_id — a note-less item would block the
-        // document delete at the DB instead.
-        dto.setNote("Begleittext");
-        JourneyItemView appended = journeyItemService.append(story.getId(), dto);
-        em.flush();
-        em.clear();
-
-        // Route through service so the DocumentDeletingEvent fires (V72 cascade fix).
-        documentService.deleteDocument(doc.getId(), writer.getId());
-        em.flush();
-        em.clear();
-
-        List<JourneyItemView> items = journeyItemService.getItems(story.getId());
-        assertThat(items).hasSize(1);
-        assertThat(items.get(0).document()).isNull();
-
-        journeyItemService.delete(story.getId(), appended.id());
-        em.flush();
-        em.clear();
-
-        assertThat(journeyItemService.getItems(story.getId())).isEmpty();
-    }
-
-    private Geschichte savedStory() {
-        return geschichteRepository.save(Geschichte.builder()
-                .title("Eine Geschichte")
-                .status(GeschichteStatus.DRAFT)
-                .type(GeschichteType.STORY)
-                .build());
-    }
-
-    // ─── JourneyItemService.reorder — atomicity check ────────────────────────
-
-    @Test
-    void reorder_swaps_positions_atomically() {
-        // Arrange: append two items (pos 10, pos 20)
-        authenticateAs(writer, Permission.BLOG_WRITE);
-
-        JourneyItemCreateDTO dto1 = new JourneyItemCreateDTO();
-        dto1.setNote("Item one");
-        JourneyItemView item1View = journeyItemService.append(journey.getId(), dto1);
-
-        JourneyItemCreateDTO dto2 = new JourneyItemCreateDTO();
-        dto2.setNote("Item two");
-        JourneyItemView item2View = journeyItemService.append(journey.getId(), dto2);
-
-        assertThat(item1View.position()).isEqualTo(10);
-        assertThat(item2View.position()).isEqualTo(20);
-
-        // Act: reorder with [item2, item1]
-        JourneyReorderDTO reorderDto = new JourneyReorderDTO();
-        reorderDto.setItemIds(List.of(item2View.id(), item1View.id()));
-        List<JourneyItemView> reordered = journeyItemService.reorder(journey.getId(), reorderDto);
-        em.flush();
-        em.clear();
-
-        // Assert: item2 is now at position 10, item1 is at position 20
-        List<JourneyItem> persisted = journeyItemRepository.findByGeschichteIdOrderByPosition(journey.getId());
-        assertThat(persisted).hasSize(2);
-        assertThat(persisted.get(0).getId()).isEqualTo(item2View.id());
-        assertThat(persisted.get(0).getPosition()).isEqualTo(10);
-        assertThat(persisted.get(1).getId()).isEqualTo(item1View.id());
-        assertThat(persisted.get(1).getPosition()).isEqualTo(20);
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/geschichte/journeyitem/JourneyItemServiceTest.java

@@ -1,822 +0,0 @@
-package org.raddatz.familienarchiv.geschichte.journeyitem;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-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.audit.AuditKind;
-import org.raddatz.familienarchiv.audit.AuditService;
-import org.raddatz.familienarchiv.document.DatePrecision;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.geschichte.Geschichte;
-import org.raddatz.familienarchiv.geschichte.GeschichteQueryService;
-import org.raddatz.familienarchiv.geschichte.GeschichteStatus;
-import org.raddatz.familienarchiv.geschichte.GeschichteType;
-import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.user.AppUser;
-import org.raddatz.familienarchiv.user.UserService;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-import org.postgresql.util.PSQLException;
-import org.postgresql.util.PSQLState;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@ExtendWith(MockitoExtension.class)
-class JourneyItemServiceTest {
-
-    @Mock JourneyItemRepository journeyItemRepository;
-    @Mock GeschichteQueryService geschichteQueryService;
-    @Mock DocumentService documentService;
-    @Mock AuditService auditService;
-    @Mock UserService userService;
-
-    @InjectMocks JourneyItemService journeyItemService;
-
-    UUID geschichteId = UUID.randomUUID();
-    UUID itemId = UUID.randomUUID();
-    UUID docId = UUID.randomUUID();
-    UUID actorId = UUID.randomUUID();
-
-    @BeforeEach
-    void setupAuth() {
-        AppUser actor = AppUser.builder().id(actorId).email("test@test.de").build();
-        lenient().when(userService.findByEmail("test@test.de")).thenReturn(actor);
-        lenient().when(geschichteQueryService.existsById(geschichteId)).thenReturn(true);
-        SecurityContextHolder.getContext().setAuthentication(
-                new UsernamePasswordAuthenticationToken("test@test.de", null,
-                        List.of(new SimpleGrantedAuthority("BLOG_WRITE"))));
-    }
-
-    // ─── toSummary — name composition ────────────────────────────────────────
-
-    @Test
-    void toSummary_uses_linked_person_firstName_lastName() {
-        Person sender = Person.builder().firstName("Franz").lastName("Raddatz").build();
-        Document doc = makeDoc(docId, sender, List.of(), null, null);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.senderName()).isEqualTo("Franz Raddatz");
-    }
-
-    @Test
-    void toSummary_falls_back_to_senderText_when_no_person() {
-        Document doc = makeDoc(docId, null, List.of(), "Familie Müller", null);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.senderName()).isEqualTo("Familie Müller");
-    }
-
-    @Test
-    void toSummary_returns_null_senderName_when_neither_person_nor_text() {
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.senderName()).isNull();
-    }
-
-    @Test
-    void toSummary_receiverCount_0_and_null_name_when_no_receiver() {
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.receiverCount()).isEqualTo(0);
-        assertThat(summary.receiverName()).isNull();
-    }
-
-    @Test
-    void toSummary_multi_receiver_returns_first_canonical_name_and_total_count() {
-        Person emma = Person.builder().firstName("Emma").lastName("Raddatz").build();
-        Person anna = Person.builder().firstName("Anna").lastName("Amann").build();
-        Document doc = makeDoc(docId, null, List.of(emma, anna), null, null);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.receiverCount()).isEqualTo(2);
-        assertThat(summary.receiverName()).isEqualTo("Anna Amann"); // alphabetically first by lastName
-    }
-
-    @Test
-    void toSummary_datePrecision_SEASON_roundtrips() {
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-        doc.setMetaDatePrecision(DatePrecision.SEASON);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.datePrecision()).isEqualTo(DatePrecision.SEASON);
-    }
-
-    @Test
-    void toSummary_datePrecision_APPROX_roundtrips() {
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-        doc.setMetaDatePrecision(DatePrecision.APPROX);
-
-        var summary = journeyItemService.toSummary(doc);
-
-        assertThat(summary.datePrecision()).isEqualTo(DatePrecision.APPROX);
-    }
-
-    // ─── append ──────────────────────────────────────────────────────────────
-
-    @Test
-    void append_to_empty_journey_starts_at_10() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.empty());
-        JourneyItem saved = savedItem(itemId, journey, 10, null, "Note");
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(saved);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("Note");
-
-        JourneyItemView view = journeyItemService.append(geschichteId, dto);
-
-        assertThat(view.position()).isEqualTo(10);
-    }
-
-    @Test
-    void append_after_reorder_continues_from_max_position() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(2L);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.of(40));
-        JourneyItem saved = savedItem(itemId, journey, 50, null, "Note");
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(saved);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("Note");
-
-        JourneyItemView view = journeyItemService.append(geschichteId, dto);
-
-        assertThat(view.position()).isEqualTo(50);
-    }
-
-    @Test
-    void append_returns400_when_neither_documentId_nor_note() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .hasMessageContaining("documentId or note");
-    }
-
-    @Test
-    void append_returns400_when_note_trims_to_empty_and_no_document() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("   \n  ");
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class);
-    }
-
-    @Test
-    void append_rejects_note_longer_than_2000_chars_with_JOURNEY_NOTE_TOO_LONG() {
-        // 2000 is the spec'd limit (frontend maxlength + i18n message agree) — see #793.
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("x".repeat(2001));
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_NOTE_TOO_LONG));
-    }
-
-    @Test
-    void append_accepts_note_of_exactly_2000_chars() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.empty());
-        JourneyItem saved = savedItem(itemId, journey, 10, null, "x".repeat(2000));
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(saved);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("x".repeat(2000));
-
-        assertThat(journeyItemService.append(geschichteId, dto).note()).hasSize(2000);
-    }
-
-    @Test
-    void append_returns404_when_documentId_does_not_exist() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-        when(documentService.findSummaryByIdInternal(docId))
-                .thenThrow(DomainException.notFound(ErrorCode.DOCUMENT_NOT_FOUND, "not found"));
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(docId);
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.DOCUMENT_NOT_FOUND));
-    }
-
-    @Test
-    void append_returns409_when_100_items_exist() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(100L);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("Note");
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_AT_CAPACITY));
-    }
-
-    @Test
-    void append_returns409_when_document_already_in_journey() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(1L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(geschichteId, docId)).thenReturn(true);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(docId);
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED));
-    }
-
-    @Test
-    void append_to_STORY_type_creates_journey_item() {
-        Geschichte story = story(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(story));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(geschichteId, docId)).thenReturn(false);
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-        when(documentService.findSummaryByIdInternal(docId)).thenReturn(doc);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.empty());
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(savedItemWithDoc(itemId, story, 10, doc, null));
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(docId);
-
-        JourneyItemView view = journeyItemService.append(geschichteId, dto);
-
-        assertThat(view.position()).isEqualTo(10);
-        assertThat(view.document().id()).isEqualTo(docId);
-    }
-
-    @Test
-    void append_to_STORY_type_respects_capacity_cap() {
-        Geschichte story = story(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(story));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(100L);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(docId);
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_AT_CAPACITY));
-    }
-
-    @Test
-    void append_to_STORY_type_rejects_duplicate_document() {
-        Geschichte story = story(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(story));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(1L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(geschichteId, docId)).thenReturn(true);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(docId);
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED));
-    }
-
-    @Test
-    void cap_is_COUNT_based_not_MAX_position_based() {
-        // 99 rows with MAX(position)=2000 should still accept the 100th append
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(99L);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.of(2000));
-        JourneyItem saved = savedItem(itemId, journey, 2010, null, "Note");
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(saved);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("Note");
-
-        assertThat(journeyItemService.append(geschichteId, dto).position()).isEqualTo(2010);
-    }
-
-    @Test
-    void append_maps_unique_index_violation_to_409_JOURNEY_DOCUMENT_ALREADY_ADDED() throws Exception {
-        // Two concurrent appends can both pass the exists() pre-check; the partial
-        // unique index then rejects the second INSERT at flush. The service must
-        // translate that into the same friendly 409 as the pre-check.
-        // Uses PSQLException with SQLState 23505 — the real payload Postgres delivers.
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(1L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(eq(geschichteId), any())).thenReturn(false);
-        when(documentService.findSummaryByIdInternal(any())).thenReturn(makeDoc(UUID.randomUUID(), null, List.of(), null, null));
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.of(10));
-        PSQLException psqlEx = new PSQLException("duplicate key value violates unique constraint",
-                PSQLState.UNIQUE_VIOLATION);
-        when(journeyItemRepository.saveAndFlush(any()))
-                .thenThrow(new org.springframework.dao.DataIntegrityViolationException(
-                        "could not execute statement", psqlEx));
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(UUID.randomUUID());
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED));
-    }
-
-    @Test
-    void append_maps_psql_sqlstate_23505_to_409_JOURNEY_DOCUMENT_ALREADY_ADDED() throws Exception {
-        // B1: the dedup check must use PSQLException.getSQLState() == "23505", not
-        // constraint-name string matching — constraint renames must not regress this.
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(1L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(eq(geschichteId), any())).thenReturn(false);
-        when(documentService.findSummaryByIdInternal(any())).thenReturn(makeDoc(UUID.randomUUID(), null, List.of(), null, null));
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.of(10));
-
-        // Simulate a real Postgres unique-violation: PSQLException with SQLState 23505
-        // wrapped by Spring's DataIntegrityViolationException.
-        PSQLException psqlEx = new PSQLException("duplicate key value violates unique constraint",
-                PSQLState.UNIQUE_VIOLATION);
-        org.springframework.dao.DataIntegrityViolationException dive =
-                new org.springframework.dao.DataIntegrityViolationException("could not execute statement", psqlEx);
-        when(journeyItemRepository.saveAndFlush(any())).thenThrow(dive);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(UUID.randomUUID());
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_DOCUMENT_ALREADY_ADDED));
-    }
-
-    @Test
-    void append_rethrows_unrelated_integrity_violations_instead_of_mislabeling_them() throws Exception {
-        // An FK violation (document deleted between load and flush) must NOT be
-        // translated into "already added" — only the dedup unique index (23505) earns that 409.
-        // FK violations arrive as PSQLException with SQLState 23503 (foreign_key_violation).
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(1L);
-        when(journeyItemRepository.existsByGeschichteIdAndDocumentId(eq(geschichteId), any())).thenReturn(false);
-        when(documentService.findSummaryByIdInternal(any())).thenReturn(makeDoc(UUID.randomUUID(), null, List.of(), null, null));
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.of(10));
-        PSQLException psqlEx = new PSQLException("foreign key violation", PSQLState.FOREIGN_KEY_VIOLATION);
-        when(journeyItemRepository.saveAndFlush(any()))
-                .thenThrow(new org.springframework.dao.DataIntegrityViolationException(
-                        "could not execute statement", psqlEx));
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setDocumentId(UUID.randomUUID());
-
-        assertThatThrownBy(() -> journeyItemService.append(geschichteId, dto))
-                .isInstanceOf(org.springframework.dao.DataIntegrityViolationException.class);
-    }
-
-    @Test
-    void append_audits_JOURNEY_ITEM_ADDED() {
-        Geschichte journey = journey(geschichteId);
-        when(geschichteQueryService.findById(geschichteId)).thenReturn(Optional.of(journey));
-        when(journeyItemRepository.countByGeschichteId(geschichteId)).thenReturn(0L);
-        when(journeyItemRepository.findMaxPositionByGeschichteId(geschichteId)).thenReturn(Optional.empty());
-        JourneyItem saved = savedItem(itemId, journey, 10, null, "Note");
-        when(journeyItemRepository.saveAndFlush(any())).thenReturn(saved);
-
-        JourneyItemCreateDTO dto = new JourneyItemCreateDTO();
-        dto.setNote("Note");
-        journeyItemService.append(geschichteId, dto);
-
-        verify(auditService).logAfterCommit(eq(AuditKind.JOURNEY_ITEM_ADDED), eq(actorId), isNull(), any());
-    }
-
-    // ─── updateNote ───────────────────────────────────────────────────────────
-
-    @Test
-    void updateNote_absent_leaves_note_unchanged() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, "Original note");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        // note is null by default — absent from JSON, no-op
-
-        JourneyItemView view = journeyItemService.updateNote(geschichteId, itemId, dto);
-
-        assertThat(view.note()).isEqualTo("Original note");
-        verify(journeyItemRepository, never()).save(any());
-    }
-
-    @Test
-    void updateNote_null_clears_note_when_document_is_present() {
-        Geschichte journey = journey(geschichteId);
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-        JourneyItem item = savedItemWithDoc(itemId, journey, 10, doc, "Old note");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-        JourneyItem saved = savedItemWithDoc(itemId, journey, 10, doc, null);
-        when(journeyItemRepository.save(item)).thenReturn(saved);
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.empty());
-
-        JourneyItemView view = journeyItemService.updateNote(geschichteId, itemId, dto);
-
-        assertThat(view.note()).isNull();
-    }
-
-    @Test
-    void updateNote_string_sets_note() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, null);
-        item.setNote(null);
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-        JourneyItem saved = savedItem(itemId, journey, 10, null, "New note");
-        when(journeyItemRepository.save(item)).thenReturn(saved);
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.of("New note"));
-
-        JourneyItemView view = journeyItemService.updateNote(geschichteId, itemId, dto);
-
-        assertThat(view.note()).isEqualTo("New note");
-    }
-
-    @Test
-    void updateNote_null_returns400_when_item_has_no_document() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, "Only note — no doc");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.empty());
-
-        assertThatThrownBy(() -> journeyItemService.updateNote(geschichteId, itemId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.VALIDATION_ERROR));
-    }
-
-    @Test
-    void updateNote_whitespace_only_including_newlines_stored_as_null() {
-        Geschichte journey = journey(geschichteId);
-        Document doc = makeDoc(docId, null, List.of(), null, null);
-        JourneyItem item = savedItemWithDoc(itemId, journey, 10, doc, "Old");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-        JourneyItem saved = savedItemWithDoc(itemId, journey, 10, doc, null);
-        when(journeyItemRepository.save(item)).thenReturn(saved);
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.of("\n \n"));
-
-        JourneyItemView view = journeyItemService.updateNote(geschichteId, itemId, dto);
-
-        assertThat(view.note()).isNull();
-    }
-
-    @Test
-    void patch_rejects_note_longer_than_2000_chars_with_JOURNEY_NOTE_TOO_LONG() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, "Old");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.of("x".repeat(2001)));
-
-        assertThatThrownBy(() -> journeyItemService.updateNote(geschichteId, itemId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_NOTE_TOO_LONG));
-    }
-
-    @Test
-    void updateNote_auditsNoteUpdate() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, null);
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-        JourneyItem saved = savedItem(itemId, journey, 10, null, "New note");
-        when(journeyItemRepository.save(item)).thenReturn(saved);
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.of("New note"));
-        journeyItemService.updateNote(geschichteId, itemId, dto);
-
-        verify(auditService).logAfterCommit(eq(AuditKind.JOURNEY_ITEM_NOTE_UPDATED), eq(actorId), isNull(), any());
-    }
-
-    @Test
-    void patch_returns404_when_item_belongs_to_different_journey() {
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.empty());
-
-        JourneyItemUpdateDTO dto = new JourneyItemUpdateDTO();
-        dto.setNote(Optional.of("text"));
-
-        assertThatThrownBy(() -> journeyItemService.updateNote(geschichteId, itemId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_ITEM_NOT_FOUND));
-    }
-
-    // ─── delete ───────────────────────────────────────────────────────────────
-
-    @Test
-    void delete_returns404_when_item_already_deleted() {
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.empty());
-
-        assertThatThrownBy(() -> journeyItemService.delete(geschichteId, itemId))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.JOURNEY_ITEM_NOT_FOUND));
-    }
-
-    @Test
-    void delete_no_audit_when_item_not_found() {
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.empty());
-
-        assertThatThrownBy(() -> journeyItemService.delete(geschichteId, itemId))
-                .isInstanceOf(DomainException.class);
-
-        verify(auditService, never()).logAfterCommit(any(), any(), any(), any());
-    }
-
-    @Test
-    void delete_audits_JOURNEY_ITEM_REMOVED_when_item_found() {
-        Geschichte journey = journey(geschichteId);
-        JourneyItem item = savedItem(itemId, journey, 10, null, "Note");
-        when(journeyItemRepository.findByIdAndGeschichteId(itemId, geschichteId)).thenReturn(Optional.of(item));
-
-        journeyItemService.delete(geschichteId, itemId);
-
-        verify(auditService).logAfterCommit(eq(AuditKind.JOURNEY_ITEM_REMOVED), eq(actorId), isNull(), any());
-    }
-
-    // ─── reorder ─────────────────────────────────────────────────────────────
-
-    @Test
-    void reorder_unknownGeschichteId_throws404() {
-        UUID unknownId = UUID.randomUUID();
-        // geschichteQueryService is not lenient-stubbed for unknownId → returns false
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of());
-
-        assertThatThrownBy(() -> journeyItemService.reorder(unknownId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.GESCHICHTE_NOT_FOUND));
-    }
-
-    @Test
-    void reorder_returns400_when_itemIds_contain_duplicates() {
-        UUID id1 = UUID.randomUUID();
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(id1, id1));  // duplicate
-
-        assertThatThrownBy(() -> journeyItemService.reorder(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.VALIDATION_ERROR));
-    }
-
-    @Test
-    void reorder_returns400_when_itemId_belongs_to_different_journey() {
-        UUID foreignId = UUID.randomUUID();
-        UUID localId = UUID.randomUUID();
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(localId));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(foreignId));
-
-        assertThatThrownBy(() -> journeyItemService.reorder(geschichteId, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> assertThat(((DomainException) e).getCode())
-                        .isEqualTo(ErrorCode.VALIDATION_ERROR));
-    }
-
-    @Test
-    void reorder_returns400_when_ids_have_extra_items() {
-        UUID id1 = UUID.randomUUID();
-        UUID id2 = UUID.randomUUID();
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(id1, id2));
-
-        assertThatThrownBy(() -> journeyItemService.reorder(geschichteId, dto))
-                .isInstanceOf(DomainException.class);
-    }
-
-    @Test
-    void reorder_returns200_when_empty_on_empty_journey() {
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of());
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of());
-
-        List<JourneyItemView> result = journeyItemService.reorder(geschichteId, dto);
-
-        assertThat(result).isEmpty();
-    }
-
-    @Test
-    void reorder_returns400_when_empty_on_nonempty_journey() {
-        UUID id1 = UUID.randomUUID();
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of());
-
-        assertThatThrownBy(() -> journeyItemService.reorder(geschichteId, dto))
-                .isInstanceOf(DomainException.class);
-    }
-
-    @Test
-    void reorder_returns_items_in_new_order_starting_at_10() {
-        Geschichte journey = journey(geschichteId);
-        UUID id1 = UUID.randomUUID();
-        UUID id2 = UUID.randomUUID();
-        JourneyItem item1 = savedItem(id1, journey, 20, null, "A");
-        JourneyItem item2 = savedItem(id2, journey, 10, null, "B");
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1, id2));
-        when(journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId)).thenReturn(List.of(item2, item1));
-        when(journeyItemRepository.saveAll(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(id1, id2)); // want id1 first
-
-        List<JourneyItemView> views = journeyItemService.reorder(geschichteId, dto);
-
-        assertThat(views).hasSize(2);
-        assertThat(views.get(0).id()).isEqualTo(id1);
-        assertThat(views.get(0).position()).isEqualTo(10);
-        assertThat(views.get(1).id()).isEqualTo(id2);
-        assertThat(views.get(1).position()).isEqualTo(20);
-    }
-
-    @Test
-    void reorder_identical_order_returns200() {
-        Geschichte journey = journey(geschichteId);
-        UUID id1 = UUID.randomUUID();
-        JourneyItem item1 = savedItem(id1, journey, 10, null, "A");
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1));
-        when(journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId)).thenReturn(List.of(item1));
-        when(journeyItemRepository.saveAll(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(id1));
-
-        List<JourneyItemView> views = journeyItemService.reorder(geschichteId, dto);
-
-        assertThat(views).hasSize(1);
-        assertThat(views.get(0).position()).isEqualTo(10);
-    }
-
-    @Test
-    void reorder_of_grandfathered_over_cap_journey_succeeds() {
-        Geschichte journey = journey(geschichteId);
-        // 130-item journey — reorder with all 130 IDs must succeed despite > 100 cap
-        List<UUID> ids = new java.util.ArrayList<>();
-        List<JourneyItem> items = new java.util.ArrayList<>();
-        for (int i = 1; i <= 130; i++) {
-            UUID id = UUID.randomUUID();
-            ids.add(id);
-            items.add(savedItem(id, journey, i * 10, null, "item " + i));
-        }
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(new HashSet<>(ids));
-        when(journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId)).thenReturn(items);
-        when(journeyItemRepository.saveAll(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(ids);
-
-        List<JourneyItemView> views = journeyItemService.reorder(geschichteId, dto);
-
-        assertThat(views).hasSize(130);
-    }
-
-    @Test
-    void reorder_audits_JOURNEY_ITEMS_REORDERED() {
-        Geschichte journey = journey(geschichteId);
-        UUID id1 = UUID.randomUUID();
-        JourneyItem item1 = savedItem(id1, journey, 10, null, "A");
-        when(journeyItemRepository.findIdsByGeschichteId(geschichteId)).thenReturn(Set.of(id1));
-        when(journeyItemRepository.findByGeschichteIdOrderByPosition(geschichteId)).thenReturn(List.of(item1));
-        when(journeyItemRepository.saveAll(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        JourneyReorderDTO dto = new JourneyReorderDTO();
-        dto.setItemIds(List.of(id1));
-        journeyItemService.reorder(geschichteId, dto);
-
-        verify(auditService).logAfterCommit(eq(AuditKind.JOURNEY_ITEMS_REORDERED), eq(actorId), isNull(), any());
-    }
-
-    // ─── helpers ─────────────────────────────────────────────────────────────
-
-    private Geschichte journey(UUID id) {
-        return Geschichte.builder()
-                .id(id)
-                .title("Test Journey")
-                .type(GeschichteType.JOURNEY)
-                .status(GeschichteStatus.DRAFT)
-                .build();
-    }
-
-    private Geschichte story(UUID id) {
-        return Geschichte.builder()
-                .id(id)
-                .title("Test Story")
-                .type(GeschichteType.STORY)
-                .status(GeschichteStatus.DRAFT)
-                .build();
-    }
-
-    private JourneyItem savedItem(UUID id, Geschichte g, int position, Document doc, String note) {
-        return JourneyItem.builder()
-                .id(id)
-                .geschichte(g)
-                .position(position)
-                .document(null)  // no document entity to avoid LAZY issues in unit tests
-                .note(note)
-                .build();
-    }
-
-    private JourneyItem savedItemWithDoc(UUID id, Geschichte g, int position, Document doc, String note) {
-        JourneyItem item = JourneyItem.builder()
-                .id(id)
-                .geschichte(g)
-                .position(position)
-                .document(doc)
-                .note(note)
-                .build();
-        return item;
-    }
-
-    private Document makeDoc(UUID id, Person sender, List<Person> receivers, String senderText, String receiverText) {
-        Document doc = Document.builder()
-                .id(id)
-                .title("Test Doc")
-                .originalFilename("test.pdf")
-                .status(DocumentStatus.UPLOADED)
-                .senderText(senderText)
-                .receiverText(receiverText)
-                .sender(sender)
-                .build();
-        doc.setReceivers(new HashSet<>(receivers));
-        return doc;
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/person/PersonBirthDeathMigrationTest.java

@@ -1,244 +0,0 @@
-package org.raddatz.familienarchiv.person;
-
-import org.flywaydb.core.Flyway;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.testcontainers.containers.PostgreSQLContainer;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * Verifies V76: persons.birth_year/death_year (integer) become
- * birth_date/death_date (date) + *_date_precision columns, with backfill to
- * YYYY-01-01 at YEAR precision, named CHECK constraints, and a data-quality
- * pre-check that aborts the migration on corrupt year data.
- *
- * <p>Runs Flyway programmatically (no Spring context): each test gets its own
- * database so the staged migrate-to-V75 → seed → migrate-to-latest flow and
- * the abort cases cannot interfere with each other.
- */
-class PersonBirthDeathMigrationTest {
-
-    private static final PostgreSQLContainer<?> POSTGRES = new PostgreSQLContainer<>("postgres:16-alpine");
-    private static final AtomicInteger DB_COUNTER = new AtomicInteger();
-
-    private String dbUrl;
-
-    @BeforeAll
-    static void startContainer() {
-        POSTGRES.start();
-    }
-
-    @AfterAll
-    static void stopContainer() {
-        POSTGRES.stop();
-    }
-
-    @BeforeEach
-    void createFreshDatabase() throws SQLException {
-        String dbName = "mig_v76_" + DB_COUNTER.incrementAndGet();
-        try (Connection conn = DriverManager.getConnection(
-                baseUrl("postgres"), POSTGRES.getUsername(), POSTGRES.getPassword());
-             Statement stmt = conn.createStatement()) {
-            stmt.execute("CREATE DATABASE " + dbName);
-        }
-        dbUrl = baseUrl(dbName);
-    }
-
-    @Test
-    void precheck_abortsWhenBirthYearAfterDeathYear() throws SQLException {
-        migrateTo("75");
-        seedPerson("Corrupt", 1950, 1940);
-
-        assertThatThrownBy(this::migrateToLatest)
-                .hasMessageContaining("V76 aborted")
-                .hasMessageContaining("birth_year > death_year");
-    }
-
-    @Test
-    void precheck_abortsWhenYearZeroPresent() throws SQLException {
-        migrateTo("75");
-        seedPerson("Zero", 0, null);
-
-        assertThatThrownBy(this::migrateToLatest)
-                .hasMessageContaining("V76 aborted")
-                .hasMessageContaining("birth_year=0 or death_year=0");
-    }
-
-    @Test
-    void backfill_birthOnly_becomesYearPrecisionDate_deathStaysUnknown() throws SQLException {
-        migrateTo("75");
-        seedPerson("BirthOnly", 1901, null);
-
-        migrateToLatest();
-
-        LifeDates row = lifeDates("BirthOnly");
-        assertThat(row.birthDate()).hasToString("1901-01-01");
-        assertThat(row.birthPrecision()).isEqualTo("YEAR");
-        assertThat(row.deathDate()).isNull();
-        assertThat(row.deathPrecision()).isEqualTo("UNKNOWN");
-    }
-
-    @Test
-    void backfill_deathOnly_becomesYearPrecisionDate_birthStaysUnknown() throws SQLException {
-        migrateTo("75");
-        seedPerson("DeathOnly", null, 1944);
-
-        migrateToLatest();
-
-        LifeDates row = lifeDates("DeathOnly");
-        assertThat(row.birthDate()).isNull();
-        assertThat(row.birthPrecision()).isEqualTo("UNKNOWN");
-        assertThat(row.deathDate()).hasToString("1944-01-01");
-        assertThat(row.deathPrecision()).isEqualTo("YEAR");
-    }
-
-    @Test
-    void backfill_bothNull_leavesDatesNullAndPrecisionsUnknown() throws SQLException {
-        migrateTo("75");
-        seedPerson("NoDates", null, null);
-
-        migrateToLatest();
-
-        LifeDates row = lifeDates("NoDates");
-        assertThat(row.birthDate()).isNull();
-        assertThat(row.birthPrecision()).isEqualTo("UNKNOWN");
-        assertThat(row.deathDate()).isNull();
-        assertThat(row.deathPrecision()).isEqualTo("UNKNOWN");
-    }
-
-    @Test
-    void backfill_neverProducesBirthDateAfterDeathDate() throws SQLException {
-        migrateTo("75");
-        seedPerson("SameYear", 1901, 1901);
-        seedPerson("Ordered", 1899, 1972);
-
-        migrateToLatest();
-
-        assertThat(countWhere("birth_date IS NOT NULL AND death_date IS NOT NULL AND birth_date > death_date"))
-                .isZero();
-    }
-
-    @Test
-    void yearColumnsDropped_andNamedCheckConstraintsExist() throws SQLException {
-        migrateTo("75");
-        seedPerson("Schema", 1901, 1944);
-
-        migrateToLatest();
-
-        assertThat(columnExists("birth_year")).isFalse();
-        assertThat(columnExists("death_year")).isFalse();
-        assertThat(columnExists("birth_date")).isTrue();
-        assertThat(columnExists("death_date")).isTrue();
-        for (String constraint : new String[]{
-                "chk_person_birth_before_death",
-                "chk_person_birth_date_precision_coherence",
-                "chk_person_birth_date_precision_values",
-                "chk_person_death_date_precision_coherence",
-                "chk_person_death_date_precision_values"}) {
-            assertThat(constraintExists(constraint)).as(constraint).isTrue();
-        }
-    }
-
-    // --- helpers ---
-
-    private static String baseUrl(String dbName) {
-        return "jdbc:postgresql://" + POSTGRES.getHost() + ":" + POSTGRES.getMappedPort(5432) + "/" + dbName;
-    }
-
-    private void migrateTo(String targetVersion) {
-        flywayBuilder().target(targetVersion).load().migrate();
-    }
-
-    private void migrateToLatest() {
-        flywayBuilder().load().migrate();
-    }
-
-    private org.flywaydb.core.api.configuration.FluentConfiguration flywayBuilder() {
-        return Flyway.configure()
-                .dataSource(dbUrl, POSTGRES.getUsername(), POSTGRES.getPassword())
-                .locations("classpath:db/migration")
-                .placeholders(Map.of("grafanaDbPassword", "test-only"));
-    }
-
-    private void seedPerson(String lastName, Integer birthYear, Integer deathYear) throws SQLException {
-        try (Connection conn = connect();
-             PreparedStatement stmt = conn.prepareStatement(
-                     "INSERT INTO persons (id, last_name, person_type, family_member, provisional, birth_year, death_year) "
-                             + "VALUES (gen_random_uuid(), ?, 'PERSON', false, false, ?, ?)")) {
-            stmt.setString(1, lastName);
-            stmt.setObject(2, birthYear);
-            stmt.setObject(3, deathYear);
-            stmt.executeUpdate();
-        }
-    }
-
-    private record LifeDates(Object birthDate, String birthPrecision, Object deathDate, String deathPrecision) {}
-
-    private LifeDates lifeDates(String lastName) throws SQLException {
-        try (Connection conn = connect();
-             PreparedStatement stmt = conn.prepareStatement(
-                     "SELECT birth_date, birth_date_precision, death_date, death_date_precision "
-                             + "FROM persons WHERE last_name = ?")) {
-            stmt.setString(1, lastName);
-            try (ResultSet rs = stmt.executeQuery()) {
-                assertThat(rs.next()).as("person %s exists", lastName).isTrue();
-                return new LifeDates(
-                        rs.getObject("birth_date"),
-                        rs.getString("birth_date_precision"),
-                        rs.getObject("death_date"),
-                        rs.getString("death_date_precision"));
-            }
-        }
-    }
-
-    private long countWhere(String condition) throws SQLException {
-        try (Connection conn = connect();
-             Statement stmt = conn.createStatement();
-             ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM persons WHERE " + condition)) {
-            rs.next();
-            return rs.getLong(1);
-        }
-    }
-
-    private boolean columnExists(String columnName) throws SQLException {
-        try (Connection conn = connect();
-             PreparedStatement stmt = conn.prepareStatement(
-                     "SELECT COUNT(*) FROM information_schema.columns "
-                             + "WHERE table_schema = 'public' AND table_name = 'persons' AND column_name = ?")) {
-            stmt.setString(1, columnName);
-            try (ResultSet rs = stmt.executeQuery()) {
-                rs.next();
-                return rs.getInt(1) > 0;
-            }
-        }
-    }
-
-    private boolean constraintExists(String constraintName) throws SQLException {
-        try (Connection conn = connect();
-             PreparedStatement stmt = conn.prepareStatement(
-                     "SELECT COUNT(*) FROM pg_constraint WHERE conname = ?")) {
-            stmt.setString(1, constraintName);
-            try (ResultSet rs = stmt.executeQuery()) {
-                rs.next();
-                return rs.getInt(1) > 0;
-            }
-        }
-    }
-
-    private Connection connect() throws SQLException {
-        return DriverManager.getConnection(dbUrl, POSTGRES.getUsername(), POSTGRES.getPassword());
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/person/PersonControllerTest.java

@@ -4,7 +4,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.raddatz.familienarchiv.exception.DomainException;
 import org.raddatz.familienarchiv.exception.ErrorCode;
-import org.raddatz.familienarchiv.document.DatePrecision;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.person.PersonNameAlias;
@@ -23,7 +22,6 @@ import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
-import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -217,14 +215,6 @@ class PersonControllerTest {
             public String getAlias() { return null; }
             public Integer getBirthYear() { return null; }
             public Integer getDeathYear() { return null; }
-            public java.time.LocalDate getBirthDate() { return null; }
-            public org.raddatz.familienarchiv.document.DatePrecision getBirthDatePrecision() {
-                return org.raddatz.familienarchiv.document.DatePrecision.UNKNOWN;
-            }
-            public java.time.LocalDate getDeathDate() { return null; }
-            public org.raddatz.familienarchiv.document.DatePrecision getDeathDatePrecision() {
-                return org.raddatz.familienarchiv.document.DatePrecision.UNKNOWN;
-            }
             public String getNotes() { return null; }
             public boolean isFamilyMember() { return false; }
             public boolean isProvisional() { return false; }
@@ -582,53 +572,18 @@ class PersonControllerTest {
     void createPerson_returns200_withAllSixFields() throws Exception {
         UUID id = UUID.randomUUID();
         Person saved = Person.builder().id(id).firstName("Maria").lastName("Raddatz")
-                .alias("Oma Maria")
-                .birthDate(LocalDate.of(1901, 3, 14)).birthDatePrecision(DatePrecision.DAY)
-                .deathDate(LocalDate.of(1975, 1, 1)).deathDatePrecision(DatePrecision.YEAR)
-                .notes("Some notes").build();
+                .alias("Oma Maria").birthYear(1901).deathYear(1975).notes("Some notes").build();
         when(personService.createPerson(any(org.raddatz.familienarchiv.person.PersonUpdateDTO.class))).thenReturn(saved);
 
         mockMvc.perform(post("/api/persons").with(csrf())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content("{\"firstName\":\"Maria\",\"lastName\":\"Raddatz\"," +
-                                "\"alias\":\"Oma Maria\"," +
-                                "\"birthDate\":\"1901-03-14\",\"birthDatePrecision\":\"DAY\"," +
-                                "\"deathDate\":\"1975-01-01\",\"deathDatePrecision\":\"YEAR\"," +
+                                "\"alias\":\"Oma Maria\",\"birthYear\":1901,\"deathYear\":1975," +
                                 "\"notes\":\"Some notes\",\"personType\":\"PERSON\"}"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.firstName").value("Maria"))
                 .andExpect(jsonPath("$.alias").value("Oma Maria"))
-                .andExpect(jsonPath("$.birthDate").value("1901-03-14"))
-                .andExpect(jsonPath("$.birthDatePrecision").value("DAY"));
-    }
-
-    // ─── #773: malformed date payloads return structured 400s, not Jackson traces ──
-    // Jackson rejects unknown enum values by default. Verified 2026-06-12: the only
-    // DeserializationFeature hit in src/main is RestClientOcrClient's private ObjectMapper
-    // (OCR HTTP client) — the Spring MVC mapper has no READ_UNKNOWN_ENUM_VALUES_* override.
-
-    @Test
-    @WithMockUser(authorities = "WRITE_ALL")
-    void updatePerson_returns400WithStructuredErrorCode_whenPrecisionEnumInvalid() throws Exception {
-        UUID id = UUID.randomUUID();
-        mockMvc.perform(put("/api/persons/{id}", id).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"firstName\":\"Hans\",\"lastName\":\"Müller\",\"personType\":\"PERSON\"," +
-                                "\"birthDate\":\"1901-03-14\",\"birthDatePrecision\":\"INVALID_VALUE\"}"))
-                .andExpect(status().isBadRequest())
-                .andExpect(jsonPath("$.code").value("VALIDATION_ERROR"));
-    }
-
-    @Test
-    @WithMockUser(authorities = "WRITE_ALL")
-    void updatePerson_returns400WithStructuredErrorCode_whenBirthDateNotADate() throws Exception {
-        UUID id = UUID.randomUUID();
-        mockMvc.perform(put("/api/persons/{id}", id).with(csrf())
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"firstName\":\"Hans\",\"lastName\":\"Müller\",\"personType\":\"PERSON\"," +
-                                "\"birthDate\":\"not-a-date\",\"birthDatePrecision\":\"DAY\"}"))
-                .andExpect(status().isBadRequest())
-                .andExpect(jsonPath("$.code").value("VALIDATION_ERROR"));
+                .andExpect(jsonPath("$.birthYear").value(1901));
     }
 
     // ─── Phase 1.2: @Size constraints ─────────────────────────────────────────

backend/src/test/java/org/raddatz/familienarchiv/person/PersonImportUpsertTest.java

@@ -5,9 +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.document.DatePrecision;
 
-import java.time.LocalDate;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -99,120 +97,24 @@ class PersonImportUpsertTest {
         assertThat(result.getNotes()).isEqualTo("Nichte von Herbert");
     }
 
-    // ─── life dates (ADR-025 extension via preferHumanDate, #773) ─────────────
-
     @Test
-    void upsertBySourceRef_preservesDayPrecisionDate_onReimportWithDifferentYear() {
-        // A human entered the exact birthday in-app; the spreadsheet only knows a year.
-        Person handDated = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram")
-                .birthDate(LocalDate.of(1890, 3, 14)).birthDatePrecision(DatePrecision.DAY).build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(handDated));
+    void upsertBySourceRef_fillsBlankYears_butPreservesHumanEditedYears_onReimport() {
+        // Existing has a human-set birthYear and a blank deathYear.
+        Person existing = Person.builder()
+                .id(UUID.randomUUID()).sourceRef("clara-cram")
+                .lastName("Cram").birthYear(1890).deathYear(null).build();
+        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(existing));
         when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
         PersonUpsertCommand cmd = PersonUpsertCommand.builder()
                 .sourceRef("clara-cram").lastName("Cram")
-                .birthYear(1888)
+                .birthYear(1888).deathYear(1965)
                 .personType(PersonType.PERSON).provisional(false).build();
 
         Person result = personService.upsertBySourceRef(cmd);
 
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1890, 3, 14));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.DAY);
-    }
-
-    @Test
-    void upsertBySourceRef_preservesMonthPrecisionDate_onReimport() {
-        Person handDated = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram")
-                .deathDate(LocalDate.of(1944, 11, 1)).deathDatePrecision(DatePrecision.MONTH).build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(handDated));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .deathYear(1945)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1944, 11, 1));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.MONTH);
-    }
-
-    @Test
-    void upsertBySourceRef_refreshesYearPrecisionDate_whenSpreadsheetYearChanges() {
-        // YEAR precision means "the importer's year" — a corrected spreadsheet year wins.
-        Person yearOnly = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram")
-                .birthDate(LocalDate.of(1890, 1, 1)).birthDatePrecision(DatePrecision.YEAR).build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(yearOnly));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .birthYear(1888)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1888, 1, 1));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.YEAR);
-    }
-
-    @Test
-    void upsertBySourceRef_fillsEmptyDateAtYearPrecision_onReimport() {
-        Person noDates = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram").build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(noDates));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .deathYear(1965)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1965, 1, 1));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.YEAR);
-    }
-
-    @Test
-    void upsertBySourceRef_keepsDatesEmpty_whenSpreadsheetHasNoYear() {
-        Person noDates = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram").build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(noDates));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isNull();
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-        assertThat(result.getDeathDate()).isNull();
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-    }
-
-    @Test
-    void upsertBySourceRef_translatesYearToDate_onFirstImport() {
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.empty());
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .birthYear(1890).deathYear(1965)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1890, 1, 1));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.YEAR);
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1965, 1, 1));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.YEAR);
+        assertThat(result.getBirthYear()).isEqualTo(1890); // human value kept
+        assertThat(result.getDeathYear()).isEqualTo(1965); // blank filled from canonical
     }
 
     @Test
@@ -297,70 +199,4 @@ class PersonImportUpsertTest {
 
         assertThat(result.getGeneration()).isEqualTo(3);
     }
-
-    // ─── conflicting canonical life dates degrade instead of hitting the DB CHECK ──
-    // (chk_person_birth_before_death would abort the whole batch — REQ-IMP-001)
-
-    @Test
-    void upsertBySourceRef_dropsBothDates_whenCanonicalBirthAfterDeath_newPerson() {
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.empty());
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .birthYear(1950).deathYear(1949)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isNull();
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-        assertThat(result.getDeathDate()).isNull();
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-    }
-
-    @Test
-    void upsertBySourceRef_keepsHandEnteredBirth_andDropsConflictingCanonicalDeath() {
-        // A human entered an exact birthday; the spreadsheet's death year lies before it.
-        // The hand-entered side must survive, the conflicting canonical refresh is dropped.
-        Person handDated = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram")
-                .birthDate(LocalDate.of(1950, 6, 1)).birthDatePrecision(DatePrecision.DAY).build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(handDated));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .deathYear(1949)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1950, 6, 1));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.DAY);
-        assertThat(result.getDeathDate()).isNull();
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-    }
-
-    @Test
-    void upsertBySourceRef_keepsExistingYearDates_whenCanonicalRefreshConflicts() {
-        Person existing = Person.builder()
-                .id(UUID.randomUUID()).sourceRef("clara-cram").lastName("Cram")
-                .birthDate(LocalDate.of(1900, 1, 1)).birthDatePrecision(DatePrecision.YEAR)
-                .deathDate(LocalDate.of(1980, 1, 1)).deathDatePrecision(DatePrecision.YEAR).build();
-        when(personRepository.findBySourceRef("clara-cram")).thenReturn(Optional.of(existing));
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpsertCommand cmd = PersonUpsertCommand.builder()
-                .sourceRef("clara-cram").lastName("Cram")
-                .birthYear(1990).deathYear(1985)
-                .personType(PersonType.PERSON).provisional(false).build();
-
-        Person result = personService.upsertBySourceRef(cmd);
-
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1900, 1, 1));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.YEAR);
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1980, 1, 1));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.YEAR);
-    }
 }

backend/src/test/java/org/raddatz/familienarchiv/person/PersonRepositoryTest.java

@@ -18,9 +18,6 @@ import org.raddatz.familienarchiv.document.DocumentRepository;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
-import org.raddatz.familienarchiv.document.DatePrecision;
-
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -124,60 +121,37 @@ class PersonRepositoryTest {
                 .containsExactly("Anna", "Clara");
     }
 
-    // ─── findByAlias (exact) / findAllByAliasIgnoreCase (case-folding siblings) ───
+    // ─── findByAliasIgnoreCase ────────────────────────────────────────────────
 
     @Test
-    void findByAlias_returnsExactCaseMatchOnly() {
+    void findByAliasIgnoreCase_returnsMatchingPerson() {
         personRepository.save(Person.builder()
                 .firstName("Karl").lastName("Brandt").alias("Opa Karl").build());
 
-        assertThat(personRepository.findByAlias("Opa Karl")).isPresent();
-        assertThat(personRepository.findByAlias("opa karl")).isEmpty(); // exact-case: a folded form does NOT match
+        Optional<Person> found = personRepository.findByAliasIgnoreCase("opa karl");
+
+        assertThat(found).isPresent();
+        assertThat(found.get().getFirstName()).isEqualTo("Karl");
     }
 
     @Test
-    void findAllByAliasIgnoreCase_returnsEmpty_whenAliasDoesNotMatch() {
-        assertThat(personRepository.findAllByAliasIgnoreCase("nobody")).isEmpty();
+    void findByAliasIgnoreCase_returnsEmpty_whenAliasDoesNotMatch() {
+        Optional<Person> found = personRepository.findByAliasIgnoreCase("nobody");
+
+        assertThat(found).isEmpty();
     }
 
-    @Test
-    void findAllByAliasIgnoreCase_foldsUmlautCase_inRealPostgres() {
-        // Proves Postgres LOWER() folds ü the same way for both rows — a plain-ASCII probe would
-        // stay green even if umlaut folding regressed. Both case-colliding aliases must match.
-        personRepository.save(Person.builder().lastName("Müller").alias("Müller").build());
-        personRepository.save(Person.builder().lastName("müller").alias("müller").build());
-
-        assertThat(personRepository.findAllByAliasIgnoreCase("MÜLLER")).hasSize(2);
-    }
-
-    // ─── findByFirstNameAndLastName (exact) / findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase ───
+    // ─── findByFirstNameIgnoreCaseAndLastNameIgnoreCase ───────────────────────
 
     @Test
-    void findByFirstNameAndLastName_returnsExactCaseMatchOnly() {
+    void findByFirstNameIgnoreCaseAndLastNameIgnoreCase_returnsMatch() {
         personRepository.save(Person.builder().firstName("Maria").lastName("Raddatz").build());
 
-        assertThat(personRepository.findByFirstNameAndLastName("Maria", "Raddatz")).isPresent();
-        assertThat(personRepository.findByFirstNameAndLastName("maria", "raddatz")).isEmpty(); // exact-case only
-    }
+        Optional<Person> found = personRepository.findByFirstNameIgnoreCaseAndLastNameIgnoreCase(
+                "maria", "raddatz");
 
-    @Test
-    void findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase_foldsUmlautCase_inRealPostgres() {
-        personRepository.save(Person.builder().firstName("Hans").lastName("Müller").build());
-        personRepository.save(Person.builder().firstName("hans").lastName("müller").build());
-
-        assertThat(personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase("HANS", "MÜLLER"))
-                .hasSize(2);
-    }
-
-    @Test
-    void findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase_nullFirstName_foldsToNoMatch() {
-        // Fail-closed: a last-name-only filename (null first name) must NOT widen to first_name IS
-        // NULL and pull in the institution/last-name-only row as a "sender". Proven on real
-        // Postgres because a mocked unit test cannot catch the IS NULL vs `= NULL` semantics.
-        personRepository.save(Person.builder().lastName("Müller").build()); // first_name NULL
-
-        assertThat(personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase(null, "Müller"))
-                .isEmpty();
+        assertThat(found).isPresent();
+        assertThat(found.get().getFirstName()).isEqualTo("Maria");
     }
 
     // ─── findCorrespondents ───────────────────────────────────────────────────
@@ -431,67 +405,6 @@ class PersonRepositoryTest {
         assertThat(results).hasSize(1);
     }
 
-    @Test
-    void searchByName_findsByAliasFirstName() {
-        Person clara = personRepository.save(Person.builder().firstName("Clara").lastName("Cram").build());
-        aliasRepository.save(PersonNameAlias.builder()
-                .person(clara).firstName("Wilhelmina").lastName("de Gruyter")
-                .type(PersonNameAliasType.BIRTH).sortOrder(0).build());
-
-        List<Person> results = personRepository.searchByName("Wilhelmina");
-
-        assertThat(results).hasSize(1);
-        assertThat(results.get(0).getLastName()).isEqualTo("Cram");
-    }
-
-    @Test
-    void searchByName_ordersByLastNameThenFirstName() {
-        personRepository.save(Person.builder().firstName("Clara").lastName("Cram").build());
-        personRepository.save(Person.builder().firstName("Anna").lastName("Cram").build());
-        personRepository.save(Person.builder().firstName("Bernd").lastName("Cram").build());
-
-        List<Person> results = personRepository.searchByName("Cram");
-
-        assertThat(results).extracting(Person::getFirstName)
-                .containsExactly("Anna", "Bernd", "Clara");
-    }
-
-    // ─── resolveByName fetch→classify, end-to-end on real Postgres (#763 review) ───
-    // The classifier unit tests in PersonServiceTest stub searchByName, so they never prove the
-    // fetch query actually finds an alias-only match and feeds it into classification. These walk
-    // the whole searchByName → resolveByName path over the real Postgres slice, closing AC#4/#5.
-
-    @Test
-    void resolveByName_maidenAlias_classifiesAsDirect_endToEnd() {
-        PersonService personService = new PersonService(personRepository, aliasRepository);
-        Person clara = personRepository.save(Person.builder().firstName("Clara").lastName("Müller").build());
-        aliasRepository.save(PersonNameAlias.builder()
-                .person(clara).lastName("Cram").type(PersonNameAliasType.MAIDEN_NAME).sortOrder(0).build());
-        // Detach so resolveByName re-fetches with its lazy nameAliases loaded from the DB —
-        // the fresh-session behaviour the @Transactional(readOnly=true) path has in production.
-        entityManager.flush();
-        entityManager.clear();
-
-        NameMatches matches = personService.resolveByName("Clara Cram");
-
-        assertThat(matches.direct()).extracting(Person::getId).containsExactly(clara.getId());
-    }
-
-    @Test
-    void resolveByName_aliasFirstName_classifiesAsDirect_endToEnd() {
-        PersonService personService = new PersonService(personRepository, aliasRepository);
-        Person clara = personRepository.save(Person.builder().firstName("Clara").lastName("Cram").build());
-        aliasRepository.save(PersonNameAlias.builder()
-                .person(clara).firstName("Wilhelmina").lastName("de Gruyter")
-                .type(PersonNameAliasType.BIRTH).sortOrder(0).build());
-        entityManager.flush();
-        entityManager.clear();
-
-        NameMatches matches = personService.resolveByName("Wilhelmina");
-
-        assertThat(matches.direct()).extracting(Person::getId).containsExactly(clara.getId());
-    }
-
     // ─── searchWithDocumentCount with aliases ────────────────────────────────
 
     @Test
@@ -913,146 +826,4 @@ class PersonRepositoryTest {
                 .setParameter(1, blockId).getSingleResult();
         assertThat(text).isEqualTo("Brief an @Auguste Raddatz und @Clara Cram");
     }
-
-    // ─── #773: PersonSummaryDTO year projection from birth_date/death_date ──────
-
-    @Test
-    void findAllWithDocumentCount_derivesYearsFromDates_nullSafe() {
-        personRepository.save(Person.builder()
-                .firstName("Maria").lastName("Datiert")
-                .birthDate(LocalDate.of(1901, 3, 14)).birthDatePrecision(DatePrecision.DAY)
-                .build());
-        personRepository.save(Person.builder()
-                .firstName("Nora").lastName("Undatiert")
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> all = personRepository.findAllWithDocumentCount();
-
-        PersonSummaryDTO dated = all.stream()
-                .filter(p -> "Datiert".equals(p.getLastName())).findFirst().orElseThrow();
-        assertThat(dated.getBirthYear()).isEqualTo(1901);
-        assertThat(dated.getDeathYear()).isNull();
-        PersonSummaryDTO undated = all.stream()
-                .filter(p -> "Undatiert".equals(p.getLastName())).findFirst().orElseThrow();
-        assertThat(undated.getBirthYear()).isNull();
-        assertThat(undated.getDeathYear()).isNull();
-    }
-
-    @Test
-    void searchWithDocumentCount_groupByPath_derivesYearsFromDates() {
-        personRepository.save(Person.builder()
-                .firstName("Herbert").lastName("Gruppiert")
-                .birthDate(LocalDate.of(1899, 1, 1)).birthDatePrecision(DatePrecision.YEAR)
-                .deathDate(LocalDate.of(1972, 6, 12)).deathDatePrecision(DatePrecision.DAY)
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> found = personRepository.searchWithDocumentCount("Gruppiert");
-
-        assertThat(found).hasSize(1);
-        assertThat(found.get(0).getBirthYear()).isEqualTo(1899);
-        assertThat(found.get(0).getDeathYear()).isEqualTo(1972);
-    }
-
-    @Test
-    void findByFilter_derivesYearsFromDates() {
-        personRepository.save(Person.builder()
-                .firstName("Filtriert").lastName("Person")
-                .birthDate(LocalDate.of(1920, 1, 1)).birthDatePrecision(DatePrecision.YEAR)
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> found = personRepository.findByFilter(
-                null, null, null, null, false, "Filtriert", 10, 0);
-
-        assertThat(found).hasSize(1);
-        assertThat(found.get(0).getBirthYear()).isEqualTo(1920);
-        assertThat(found.get(0).getDeathYear()).isNull();
-    }
-
-    // ─── #773 follow-up: full date + precision exposed on the summary projection ──
-    // (the mention dropdown renders precise life dates from the list endpoint)
-
-    @Test
-    void findAllWithDocumentCount_exposesDateAndPrecisionFields() {
-        personRepository.save(Person.builder()
-                .firstName("Maria").lastName("Praezise")
-                .birthDate(LocalDate.of(1901, 3, 14)).birthDatePrecision(DatePrecision.DAY)
-                .deathDate(LocalDate.of(1972, 1, 1)).deathDatePrecision(DatePrecision.YEAR)
-                .build());
-        personRepository.save(Person.builder()
-                .firstName("Nora").lastName("Datenlos")
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> all = personRepository.findAllWithDocumentCount();
-
-        PersonSummaryDTO dated = all.stream()
-                .filter(p -> "Praezise".equals(p.getLastName())).findFirst().orElseThrow();
-        assertThat(dated.getBirthDate()).isEqualTo(LocalDate.of(1901, 3, 14));
-        assertThat(dated.getBirthDatePrecision()).isEqualTo(DatePrecision.DAY);
-        assertThat(dated.getDeathDate()).isEqualTo(LocalDate.of(1972, 1, 1));
-        assertThat(dated.getDeathDatePrecision()).isEqualTo(DatePrecision.YEAR);
-        PersonSummaryDTO undated = all.stream()
-                .filter(p -> "Datenlos".equals(p.getLastName())).findFirst().orElseThrow();
-        assertThat(undated.getBirthDate()).isNull();
-        assertThat(undated.getBirthDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-        assertThat(undated.getDeathDate()).isNull();
-        assertThat(undated.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-    }
-
-    @Test
-    void searchWithDocumentCount_exposesDateAndPrecisionFields() {
-        personRepository.save(Person.builder()
-                .firstName("Herbert").lastName("Suchbar")
-                .birthDate(LocalDate.of(1899, 1, 1)).birthDatePrecision(DatePrecision.YEAR)
-                .deathDate(LocalDate.of(1972, 6, 12)).deathDatePrecision(DatePrecision.DAY)
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> found = personRepository.searchWithDocumentCount("Suchbar");
-
-        assertThat(found).hasSize(1);
-        assertThat(found.get(0).getBirthDate()).isEqualTo(LocalDate.of(1899, 1, 1));
-        assertThat(found.get(0).getBirthDatePrecision()).isEqualTo(DatePrecision.YEAR);
-        assertThat(found.get(0).getDeathDate()).isEqualTo(LocalDate.of(1972, 6, 12));
-        assertThat(found.get(0).getDeathDatePrecision()).isEqualTo(DatePrecision.DAY);
-    }
-
-    @Test
-    void findTopByDocumentCount_exposesDateAndPrecisionFields() {
-        personRepository.save(Person.builder()
-                .firstName("Top").lastName("Dokumentiert")
-                .birthDate(LocalDate.of(1910, 5, 1)).birthDatePrecision(DatePrecision.MONTH)
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> top = personRepository.findTopByDocumentCount(10);
-
-        PersonSummaryDTO found = top.stream()
-                .filter(p -> "Dokumentiert".equals(p.getLastName())).findFirst().orElseThrow();
-        assertThat(found.getBirthDate()).isEqualTo(LocalDate.of(1910, 5, 1));
-        assertThat(found.getBirthDatePrecision()).isEqualTo(DatePrecision.MONTH);
-        assertThat(found.getDeathDate()).isNull();
-        assertThat(found.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-    }
-
-    @Test
-    void findByFilter_exposesDateAndPrecisionFields() {
-        personRepository.save(Person.builder()
-                .firstName("Gefiltert").lastName("Genau")
-                .deathDate(LocalDate.of(1944, 11, 2)).deathDatePrecision(DatePrecision.DAY)
-                .build());
-        entityManager.flush();
-
-        List<PersonSummaryDTO> found = personRepository.findByFilter(
-                null, null, null, null, false, "Gefiltert", 10, 0);
-
-        assertThat(found).hasSize(1);
-        assertThat(found.get(0).getBirthDate()).isNull();
-        assertThat(found.get(0).getBirthDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-        assertThat(found.get(0).getDeathDate()).isEqualTo(LocalDate.of(1944, 11, 2));
-        assertThat(found.get(0).getDeathDatePrecision()).isEqualTo(DatePrecision.DAY);
-    }
 }

backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceIntegrationTest.java

@@ -4,7 +4,6 @@ import org.junit.jupiter.api.Test;
 import org.raddatz.familienarchiv.PostgresContainerConfig;
 import org.raddatz.familienarchiv.document.Document;
 import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentService;
 import org.raddatz.familienarchiv.document.DocumentStatus;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.person.PersonType;
@@ -17,13 +16,10 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.transaction.annotation.Transactional;
 import software.amazon.awssdk.services.s3.S3Client;
 
-import org.springframework.mock.web.MockMultipartFile;
-
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 
 import java.util.Set;
-import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -37,7 +33,6 @@ class PersonServiceIntegrationTest {
     @Autowired PersonService personService;
     @Autowired PersonRepository personRepository;
     @Autowired DocumentRepository documentRepository;
-    @Autowired DocumentService documentService;
 
     @PersistenceContext EntityManager entityManager;
 
@@ -80,93 +75,6 @@ class PersonServiceIntegrationTest {
         assertThat(result.getLastName()).isEqualTo("Cram");
     }
 
-    // ─── #731: case-colliding alias resolution against real Postgres ───────────
-    // The umlaut pair is mandatory — only the real DB proves Postgres LOWER() folds ü; a
-    // plain-ASCII test would stay green while umlaut aliases regressed.
-
-    @Test
-    void findOrCreateByAlias_resolvesUmlautAliasCollision_toLowestId_withoutThrow() {
-        Person muller = personRepository.save(Person.builder().lastName("Müller").alias("Müller").build());
-        Person mullerLower = personRepository.save(Person.builder().lastName("müller").alias("müller").build());
-        UUID expected = muller.getId().compareTo(mullerLower.getId()) <= 0 ? muller.getId() : mullerLower.getId();
-
-        // No exact-case "MÜLLER" row → falls through to the case-insensitive branch with two
-        // candidates and must pick the lowest id, never throwing NonUniqueResultException.
-        Person resolved = personService.findOrCreateByAlias("MÜLLER");
-
-        assertThat(resolved.getId()).isEqualTo(expected);
-    }
-
-    @Test
-    void findOrCreateByAlias_umlautAliasCollision_isDeterministicAcrossCalls() {
-        personRepository.save(Person.builder().lastName("Müller").alias("Müller").build());
-        personRepository.save(Person.builder().lastName("müller").alias("müller").build());
-
-        Person first = personService.findOrCreateByAlias("MÜLLER");
-        Person second = personService.findOrCreateByAlias("MÜLLER");
-
-        assertThat(second.getId()).isEqualTo(first.getId());
-    }
-
-    // ─── #731: filename-based sender resolution against real Postgres ──────────
-
-    @Test
-    void storeDocument_resolvesSender_whenFilenameNameIsUnique() throws Exception {
-        Person hans = personRepository.save(Person.builder().firstName("Hans").lastName("Müller").build());
-
-        Document doc = uploadNamed("1965-03-12_Müller_Hans.pdf").document();
-
-        assertThat(doc.getSender()).isNotNull();
-        assertThat(doc.getSender().getId()).isEqualTo(hans.getId());
-    }
-
-    @Test
-    void storeDocument_resolvesSender_onSingleCaseInsensitiveMatch() throws Exception {
-        Person hans = personRepository.save(Person.builder().firstName("Hans").lastName("Müller").build());
-
-        // Filename folds to "hans müller"; the only stored person is "Hans Müller".
-        Document doc = uploadNamed("1965-03-12_müller_hans.pdf").document();
-
-        assertThat(doc.getSender()).isNotNull();
-        assertThat(doc.getSender().getId()).isEqualTo(hans.getId());
-    }
-
-    @Test
-    void storeDocument_leavesSenderUnset_whenFilenameNameIsAmbiguous() throws Exception {
-        // Two persons collide case-insensitively; the filename casing ("HANS"/"MÜLLER") matches
-        // neither exactly → no exact-case winner → bail to null (never an arbitrary guess), no 500.
-        personRepository.save(Person.builder().firstName("Hans").lastName("Müller").build());
-        personRepository.save(Person.builder().firstName("hans").lastName("müller").build());
-
-        Document doc = uploadNamed("1965-03-12_MÜLLER_HANS.pdf").document();
-
-        assertThat(doc.getSender()).isNull();
-    }
-
-    @Test
-    void storeDocument_leavesSenderUnset_whenFilenameHasNoFirstName() throws Exception {
-        // A last-name-only filename never resolves to a sender (the parser yields no parsed name).
-        personRepository.save(Person.builder().lastName("Müller").build());
-
-        Document doc = uploadNamed("1965-03-12_Müller.pdf").document();
-
-        assertThat(doc.getSender()).isNull();
-    }
-
-    @Test
-    void findByName_nullFirstName_resolvesToEmpty_inRealPostgres() {
-        // Fail-closed against the real DB: a null first name must NOT widen to first_name IS NULL
-        // and pick up the last-name-only row.
-        personRepository.save(Person.builder().lastName("Müller").build()); // first_name NULL
-
-        assertThat(personService.findByName(null, "Müller")).isEmpty();
-    }
-
-    private DocumentService.StoreResult uploadNamed(String filename) throws Exception {
-        MockMultipartFile file = new MockMultipartFile("file", filename, "application/pdf", new byte[]{1, 2, 3});
-        return documentService.storeDocument(file, null);
-    }
-
     // ─── #667: confirm round-trip + reader-default semantics ──────────────────
 
     @Test

backend/src/test/java/org/raddatz/familienarchiv/person/PersonServiceTest.java

@@ -8,9 +8,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import org.raddatz.familienarchiv.person.PersonNameAliasDTO;
 import org.raddatz.familienarchiv.person.PersonSummaryDTO;
 import org.raddatz.familienarchiv.person.PersonUpdateDTO;
-import org.raddatz.familienarchiv.document.DatePrecision;
 import org.raddatz.familienarchiv.exception.DomainException;
-import org.raddatz.familienarchiv.exception.ErrorCode;
 import org.raddatz.familienarchiv.person.Person;
 import org.raddatz.familienarchiv.person.PersonNameAlias;
 import org.raddatz.familienarchiv.person.PersonNameAliasType;
@@ -19,7 +17,6 @@ import org.raddatz.familienarchiv.person.PersonNameAliasRepository;
 import org.raddatz.familienarchiv.person.PersonRepository;
 import org.springframework.web.server.ResponseStatusException;
 
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -244,49 +241,27 @@ class PersonServiceTest {
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
         dto.setFirstName("Maria"); dto.setLastName("Raddatz"); dto.setAlias("Oma Maria");
-        dto.setBirthDate(LocalDate.of(1901, 3, 14)); dto.setBirthDatePrecision(DatePrecision.DAY);
-        dto.setDeathDate(LocalDate.of(1975, 11, 2)); dto.setDeathDatePrecision(DatePrecision.DAY);
-        dto.setNotes("Some notes");
+        dto.setBirthYear(1901); dto.setDeathYear(1975); dto.setNotes("Some notes");
 
         Person result = personService.createPerson(dto);
 
         assertThat(result.getFirstName()).isEqualTo("Maria");
         assertThat(result.getLastName()).isEqualTo("Raddatz");
         assertThat(result.getAlias()).isEqualTo("Oma Maria");
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1901, 3, 14));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.DAY);
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1975, 11, 2));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.DAY);
+        assertThat(result.getBirthYear()).isEqualTo(1901);
+        assertThat(result.getDeathYear()).isEqualTo(1975);
         assertThat(result.getNotes()).isEqualTo("Some notes");
     }
 
     @Test
-    void createPerson_dto_rejectsDateWithUnknownPrecision() {
+    void createPerson_dto_yearValidationFires_whenBirthYearNegative() {
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Test");
-        dto.setBirthDate(LocalDate.of(1901, 3, 14)); dto.setBirthDatePrecision(DatePrecision.UNKNOWN);
+        dto.setFirstName("Anna"); dto.setLastName("Test"); dto.setBirthYear(-1);
 
         assertThatThrownBy(() -> personService.createPerson(dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> {
-                    assertThat(((DomainException) e).getCode()).isEqualTo(ErrorCode.INVALID_DATE_PRECISION);
-                    assertThat(((DomainException) e).getStatus().value()).isEqualTo(400);
-                });
-    }
-
-    @Test
-    void createPerson_dto_treatsNullPrecisionWithNullDateAsUnknown() {
-        when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Test"); dto.setPersonType(PersonType.PERSON);
-
-        Person result = personService.createPerson(dto);
-
-        assertThat(result.getBirthDate()).isNull();
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
-        assertThat(result.getDeathDate()).isNull();
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
     }
 
     @Test
@@ -400,57 +375,14 @@ class PersonServiceTest {
     // ─── findOrCreateByAlias ─────────────────────────────────────────────────
 
     @Test
-    void findOrCreateByAlias_returnsExactCaseMatch_overCaseInsensitiveSibling() {
-        String alias = "müller";
-        Person exact = Person.builder().id(UUID.randomUUID()).alias("müller").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.of(exact));
+    void findOrCreateByAlias_returnsExisting_whenAliasFound() {
+        String alias = "Walter de Gruyter";
+        Person existing = Person.builder().id(UUID.randomUUID()).alias(alias).build();
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.of(existing));
 
         Person result = personService.findOrCreateByAlias(alias);
 
-        assertThat(result).isEqualTo(exact);
-        verify(personRepository, never()).findAllByAliasIgnoreCase(any());
-        verify(personRepository, never()).save(any());
-    }
-
-    @Test
-    void findOrCreateByAlias_returnsExactCaseMatch_evenWhenMultipleSiblingsCollide() {
-        String alias = "Müller";
-        Person exact = Person.builder().id(UUID.randomUUID()).alias("Müller").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.of(exact));
-
-        Person result = personService.findOrCreateByAlias(alias);
-
-        assertThat(result).isEqualTo(exact);
-        // exact-case short-circuits — the case-insensitive siblings are never consulted.
-        verify(personRepository, never()).findAllByAliasIgnoreCase(any());
-    }
-
-    @Test
-    void findOrCreateByAlias_usesSingleCaseInsensitiveMatch_whenNoExactCase() {
-        String alias = "müller";
-        Person only = Person.builder().id(UUID.randomUUID()).alias("Müller").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of(only));
-
-        Person result = personService.findOrCreateByAlias(alias);
-
-        assertThat(result).isEqualTo(only);
-        verify(personRepository, never()).save(any());
-    }
-
-    @Test
-    void findOrCreateByAlias_returnsLowestIdDeterministically_whenMultipleCaseInsensitiveMatches() {
-        String alias = "müller";
-        Person lower = Person.builder().id(UUID.fromString("00000000-0000-0000-0000-000000000001")).alias("Müller").build();
-        Person higher = Person.builder().id(UUID.fromString("00000000-0000-0000-0000-000000000002")).alias("müller").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of(higher, lower)); // unordered
-
-        Person first = personService.findOrCreateByAlias(alias);
-        Person second = personService.findOrCreateByAlias(alias);
-
-        assertThat(first.getId()).isEqualTo(lower.getId());      // lowest id wins
-        assertThat(second.getId()).isEqualTo(first.getId());     // same result every call — never throws
+        assertThat(result).isEqualTo(existing);
         verify(personRepository, never()).save(any());
     }
 
@@ -458,8 +390,7 @@ class PersonServiceTest {
     void findOrCreateByAlias_createsNew_whenAliasNotFound() {
         String alias = "Clara Cram";
         Person saved = Person.builder().id(UUID.randomUUID()).alias(alias).firstName("Clara").lastName("Cram").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of());
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.empty());
         when(personRepository.save(any())).thenReturn(saved);
 
         Person result = personService.findOrCreateByAlias(alias);
@@ -472,8 +403,7 @@ class PersonServiceTest {
     void findOrCreateByAlias_createsMaidenNameAlias_whenGebPresent() {
         String alias = "Clara Cram geb. de Gruyter";
         Person saved = Person.builder().id(UUID.randomUUID()).alias(alias).firstName("Clara").lastName("Cram").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of());
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.empty());
         when(personRepository.save(any())).thenReturn(saved);
         when(aliasRepository.findMaxSortOrder(saved.getId())).thenReturn(0);
         when(aliasRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
@@ -495,8 +425,7 @@ class PersonServiceTest {
     @Test
     void findOrCreateByAlias_setsInstitutionType_withFullNameInLastName() {
         String alias = "Arthur Collignon GmbH";
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of());
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.empty());
         when(personRepository.save(any())).thenAnswer(inv -> {
             Person p = inv.getArgument(0);
             p.setId(UUID.randomUUID());
@@ -513,8 +442,7 @@ class PersonServiceTest {
     @Test
     void findOrCreateByAlias_setsGroupType_withFullNameInLastName() {
         String alias = "Geschwister de Gruyter";
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of());
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.empty());
         when(personRepository.save(any())).thenAnswer(inv -> {
             Person p = inv.getArgument(0);
             p.setId(UUID.randomUUID());
@@ -532,8 +460,7 @@ class PersonServiceTest {
     void findOrCreateByAlias_noAlias_whenNoGeb() {
         String alias = "Clara Cram";
         Person saved = Person.builder().id(UUID.randomUUID()).alias(alias).firstName("Clara").lastName("Cram").build();
-        when(personRepository.findByAlias(alias)).thenReturn(Optional.empty());
-        when(personRepository.findAllByAliasIgnoreCase(alias)).thenReturn(List.of());
+        when(personRepository.findByAliasIgnoreCase(alias)).thenReturn(Optional.empty());
         when(personRepository.save(any())).thenReturn(saved);
 
         personService.findOrCreateByAlias(alias);
@@ -545,54 +472,11 @@ class PersonServiceTest {
     void findOrCreateByAlias_trimsInput() {
         String alias = "  Clara Cram  ";
         Person saved = Person.builder().id(UUID.randomUUID()).alias("Clara Cram").build();
-        when(personRepository.findByAlias("Clara Cram")).thenReturn(Optional.of(saved));
+        when(personRepository.findByAliasIgnoreCase("Clara Cram")).thenReturn(Optional.of(saved));
 
         personService.findOrCreateByAlias(alias);
 
-        verify(personRepository).findByAlias("Clara Cram");
-    }
-
-    // ─── findByName (filename-based sender resolution) ────────────────────────
-
-    @Test
-    void findByName_returnsExactCaseMatch_overCaseInsensitiveSibling() {
-        Person exact = Person.builder().id(UUID.randomUUID()).firstName("Hans").lastName("Müller").build();
-        when(personRepository.findByFirstNameAndLastName("Hans", "Müller")).thenReturn(Optional.of(exact));
-
-        assertThat(personService.findByName("Hans", "Müller")).contains(exact);
-        verify(personRepository, never()).findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase(any(), any());
-    }
-
-    @Test
-    void findByName_usesSingleCaseInsensitiveMatch_whenNoExactCase() {
-        Person only = Person.builder().id(UUID.randomUUID()).firstName("Hans").lastName("Müller").build();
-        when(personRepository.findByFirstNameAndLastName("hans", "müller")).thenReturn(Optional.empty());
-        when(personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase("hans", "müller"))
-                .thenReturn(List.of(only));
-
-        assertThat(personService.findByName("hans", "müller")).contains(only);
-    }
-
-    @Test
-    void findByName_bailsToEmpty_whenTwoOrMoreCaseInsensitiveMatches() {
-        Person a = Person.builder().id(UUID.randomUUID()).firstName("Hans").lastName("Müller").build();
-        Person b = Person.builder().id(UUID.randomUUID()).firstName("hans").lastName("müller").build();
-        when(personRepository.findByFirstNameAndLastName("hans", "müller")).thenReturn(Optional.empty());
-        when(personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase("hans", "müller"))
-                .thenReturn(List.of(a, b));
-
-        // Ambiguous sender → unset, never an arbitrary guess (provenance correctness over a
-        // confidently-wrong pre-fill). This is the deliberate divergence from the alias path.
-        assertThat(personService.findByName("hans", "müller")).isEmpty();
-    }
-
-    @Test
-    void findByName_returnsEmpty_whenFirstNameNullFoldsToNoMatch() {
-        when(personRepository.findByFirstNameAndLastName(null, "Müller")).thenReturn(Optional.empty());
-        when(personRepository.findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase(null, "Müller"))
-                .thenReturn(List.of());
-
-        assertThat(personService.findByName(null, "Müller")).isEmpty();
+        verify(personRepository).findByAliasIgnoreCase("Clara Cram");
     }
 
     // ─── updatePerson (notes) ────────────────────────────────────────────────
@@ -625,135 +509,114 @@ class PersonServiceTest {
         assertThat(result.getNotes()).isNull();
     }
 
-    // ─── updatePerson (birth/death dates) ────────────────────────────────────
+    // ─── updatePerson (birth/death years) ────────────────────────────────────
 
     @Test
-    void updatePerson_persistsBirthAndDeathDateWithPrecision() {
+    void updatePerson_persistsBirthAndDeathYear() {
         UUID id = UUID.randomUUID();
         Person person = Person.builder().id(id).firstName("Anna").lastName("Alt").build();
         when(personRepository.findById(id)).thenReturn(Optional.of(person));
         when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1890, 1, 1)); dto.setBirthDatePrecision(DatePrecision.YEAR);
-        dto.setDeathDate(LocalDate.of(1965, 6, 12)); dto.setDeathDatePrecision(DatePrecision.DAY);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(1890); dto.setDeathYear(1965);
         Person result = personService.updatePerson(id, dto);
 
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1890, 1, 1));
-        assertThat(result.getBirthDatePrecision()).isEqualTo(DatePrecision.YEAR);
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1965, 6, 12));
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.DAY);
+        assertThat(result.getBirthYear()).isEqualTo(1890);
+        assertThat(result.getDeathYear()).isEqualTo(1965);
     }
 
     @Test
-    void updatePerson_throwsBirthAfterDeath_whenBirthDateAfterDeathDate() {
+    void updatePerson_throwsBadRequest_whenBirthYearAfterDeathYear() {
         UUID id = UUID.randomUUID();
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1970, 5, 1)); dto.setBirthDatePrecision(DatePrecision.DAY);
-        dto.setDeathDate(LocalDate.of(1950, 5, 1)); dto.setDeathDatePrecision(DatePrecision.DAY);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(1970); dto.setDeathYear(1950);
         assertThatThrownBy(() -> personService.updatePerson(id, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> {
-                    assertThat(((DomainException) e).getCode()).isEqualTo(ErrorCode.BIRTH_AFTER_DEATH);
-                    assertThat(((DomainException) e).getStatus().value()).isEqualTo(400);
-                });
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
     }
 
     @Test
-    void updatePerson_throwsBirthAfterDeath_onMixedPrecisionLateBirthday() {
-        // Known limitation (#773): DAY-precision birth late in the death's YEAR-precision year
-        // compares against the year's backfilled Jan 1st and is rejected. The error message
-        // carries the workaround hint via the BIRTH_AFTER_DEATH i18n key.
-        UUID id = UUID.randomUUID();
-
-        PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1901, 11, 15)); dto.setBirthDatePrecision(DatePrecision.DAY);
-        dto.setDeathDate(LocalDate.of(1901, 1, 1)); dto.setDeathDatePrecision(DatePrecision.YEAR);
-        assertThatThrownBy(() -> personService.updatePerson(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting(e -> ((DomainException) e).getCode())
-                .isEqualTo(ErrorCode.BIRTH_AFTER_DEATH);
-    }
-
-    @Test
-    void updatePerson_doesNotThrow_whenBirthDateSetButDeathDateNull() {
+    void updatePerson_doesNotThrow_whenBirthYearNonNullButDeathYearIsNull() {
+        // Covers A && B short-circuit: birthYear != null (true) but deathYear == null (false) → no throw
         UUID id = UUID.randomUUID();
         Person person = Person.builder().id(id).firstName("Anna").lastName("Alt").build();
         when(personRepository.findById(id)).thenReturn(Optional.of(person));
         when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1890, 1, 1)); dto.setBirthDatePrecision(DatePrecision.YEAR);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(1890); dto.setDeathYear(null);
         Person result = personService.updatePerson(id, dto);
 
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1890, 1, 1));
-        assertThat(result.getDeathDate()).isNull();
-        assertThat(result.getDeathDatePrecision()).isEqualTo(DatePrecision.UNKNOWN);
+        assertThat(result.getBirthYear()).isEqualTo(1890);
+        assertThat(result.getDeathYear()).isNull();
     }
 
     @Test
-    void updatePerson_allowsEqualBirthAndDeathDate() {
+    void updatePerson_allowsSameYear() {
         UUID id = UUID.randomUUID();
         Person person = Person.builder().id(id).firstName("Anna").lastName("Alt").build();
         when(personRepository.findById(id)).thenReturn(Optional.of(person));
         when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1900, 1, 1)); dto.setBirthDatePrecision(DatePrecision.YEAR);
-        dto.setDeathDate(LocalDate.of(1900, 1, 1)); dto.setDeathDatePrecision(DatePrecision.YEAR);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(1900); dto.setDeathYear(1900);
         Person result = personService.updatePerson(id, dto);
 
-        assertThat(result.getBirthDate()).isEqualTo(LocalDate.of(1900, 1, 1));
-        assertThat(result.getDeathDate()).isEqualTo(LocalDate.of(1900, 1, 1));
+        assertThat(result.getBirthYear()).isEqualTo(1900);
+        assertThat(result.getDeathYear()).isEqualTo(1900);
     }
 
-    // ─── Date/precision coherence (V76 CHECK constraint mirror) ─────────────
+    // ─── Phase 1.3: Year range bounds (> 0) ──────────────────────────────────
 
     @Test
-    void updatePerson_throwsInvalidDatePrecision_whenDatePresentButPrecisionUnknown() {
+    void updatePerson_throwsBadRequest_whenBirthYearIsZero() {
         UUID id = UUID.randomUUID();
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setDeathDate(LocalDate.of(1944, 11, 2)); dto.setDeathDatePrecision(DatePrecision.UNKNOWN);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(0);
         assertThatThrownBy(() -> personService.updatePerson(id, dto))
-                .isInstanceOf(DomainException.class)
-                .satisfies(e -> {
-                    assertThat(((DomainException) e).getCode()).isEqualTo(ErrorCode.INVALID_DATE_PRECISION);
-                    assertThat(((DomainException) e).getStatus().value()).isEqualTo(400);
-                });
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
     }
 
     @Test
-    void updatePerson_throwsInvalidDatePrecision_whenDatePresentButPrecisionNull() {
+    void updatePerson_throwsBadRequest_whenBirthYearIsNegative() {
         UUID id = UUID.randomUUID();
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDate(LocalDate.of(1901, 3, 14));
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setBirthYear(-5);
         assertThatThrownBy(() -> personService.updatePerson(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting(e -> ((DomainException) e).getCode())
-                .isEqualTo(ErrorCode.INVALID_DATE_PRECISION);
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
     }
 
     @Test
-    void updatePerson_throwsInvalidDatePrecision_whenPrecisionSetWithoutDate() {
+    void updatePerson_throwsBadRequest_whenDeathYearIsZero() {
         UUID id = UUID.randomUUID();
 
         PersonUpdateDTO dto = new PersonUpdateDTO();
-        dto.setFirstName("Anna"); dto.setLastName("Alt");
-        dto.setBirthDatePrecision(DatePrecision.DAY);
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setDeathYear(0);
         assertThatThrownBy(() -> personService.updatePerson(id, dto))
-                .isInstanceOf(DomainException.class)
-                .extracting(e -> ((DomainException) e).getCode())
-                .isEqualTo(ErrorCode.INVALID_DATE_PRECISION);
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
+    }
+
+    @Test
+    void updatePerson_throwsBadRequest_whenDeathYearIsNegative() {
+        UUID id = UUID.randomUUID();
+
+        PersonUpdateDTO dto = new PersonUpdateDTO();
+        dto.setFirstName("Anna"); dto.setLastName("Alt"); dto.setDeathYear(-10);
+        assertThatThrownBy(() -> personService.updatePerson(id, dto))
+                .isInstanceOf(ResponseStatusException.class)
+                .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+                .isEqualTo(400);
     }
 
     // ─── findCorrespondents ──────────────────────────────────────────────────
@@ -944,165 +807,4 @@ class PersonServiceTest {
                 .extracting(e -> ((DomainException) e).getStatus().value())
                 .isEqualTo(403);
     }
-
-    @Test
-    void findByDisplayNameContaining_delegatesToSearchByName() {
-        Person walter = Person.builder().id(UUID.randomUUID()).firstName("Walter").lastName("Müller").build();
-        when(personRepository.searchByName("Walter")).thenReturn(List.of(walter));
-
-        List<Person> result = personService.findByDisplayNameContaining("Walter");
-
-        assertThat(result).containsExactly(walter);
-        verify(personRepository).searchByName("Walter");
-    }
-
-    // ─── tokenize (name-match contract) ───────────────────────────────────────
-
-    @Test
-    void tokenize_hyphenatedName_splitsOnHyphen() {
-        assertThat(PersonService.tokenize("Anna-Maria")).containsExactly("anna", "maria");
-    }
-
-    @Test
-    void tokenize_apostropheName_splitsOnApostrophe() {
-        assertThat(PersonService.tokenize("D'Angelo")).containsExactly("d", "angelo");
-    }
-
-    @Test
-    void tokenize_umlautName_lowercasesToSingleToken() {
-        assertThat(PersonService.tokenize("Müller")).containsExactly("müller");
-    }
-
-    @Test
-    void tokenize_doubleSpace_dropsEmptyTokens() {
-        assertThat(PersonService.tokenize("Clara  Cram")).containsExactly("clara", "cram");
-    }
-
-    @Test
-    void tokenize_allWhitespace_returnsEmpty() {
-        assertThat(PersonService.tokenize("   ")).isEmpty();
-    }
-
-    @Test
-    void tokenize_null_returnsEmpty() {
-        assertThat(PersonService.tokenize(null)).isEmpty();
-    }
-
-    // ─── resolveByName (direct / partial classification) ──────────────────────
-
-    @Test
-    void resolveByName_singleDirectMatch_classifiesAsDirect() {
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cram").build();
-        when(personRepository.searchByName("clara")).thenReturn(List.of(clara));
-        when(personRepository.searchByName("cram")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.direct()).containsExactly(clara);
-    }
-
-    @Test
-    void resolveByName_maidenAliasToken_classifiesAsDirect() {
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Müller")
-                .nameAliases(List.of(PersonNameAlias.builder().lastName("Cram")
-                        .type(PersonNameAliasType.MAIDEN_NAME).build()))
-                .build();
-        when(personRepository.searchByName("clara")).thenReturn(List.of(clara));
-        when(personRepository.searchByName("cram")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.direct()).containsExactly(clara);
-    }
-
-    @Test
-    void resolveByName_aliasFirstNameToken_isFetchedAndClassified() {
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cram")
-                .nameAliases(List.of(PersonNameAlias.builder().firstName("Wilhelmina").lastName("de Gruyter")
-                        .type(PersonNameAliasType.BIRTH).build()))
-                .build();
-        when(personRepository.searchByName("wilhelmina")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Wilhelmina");
-
-        assertThat(result.direct()).containsExactly(clara);
-    }
-
-    @Test
-    void resolveByName_middleName_stillDirect() {
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara Maria").lastName("Cram").build();
-        when(personRepository.searchByName("clara")).thenReturn(List.of(clara));
-        when(personRepository.searchByName("cram")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.direct()).containsExactly(clara);
-    }
-
-    @Test
-    void resolveByName_reorderedTokens_stillDirect() {
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cram").build();
-        when(personRepository.searchByName("cram")).thenReturn(List.of(clara));
-        when(personRepository.searchByName("clara")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Cram Clara");
-
-        assertThat(result.direct()).containsExactly(clara);
-    }
-
-    @Test
-    void resolveByName_cramVsCramer_classifiesAsPartial() {
-        Person cramer = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cramer").build();
-        when(personRepository.searchByName("clara")).thenReturn(List.of(cramer));
-        when(personRepository.searchByName("cram")).thenReturn(List.of(cramer));
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.partial()).containsExactly(cramer);
-    }
-
-    @Test
-    void resolveByName_emptyAfterTokenizing_returnsNoCandidates() {
-        NameMatches result = personService.resolveByName("  -  ");
-
-        assertThat(result.direct()).isEmpty();
-        verify(personRepository, never()).searchByName(any());
-    }
-
-    @Test
-    void resolveByName_directSortsBeyondCap_stillReturnedAsDirect() {
-        List<Person> pool = new java.util.ArrayList<>();
-        for (int i = 0; i < 10; i++) {
-            pool.add(Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cramer").build());
-        }
-        Person direct = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cram").build();
-        pool.add(direct);
-        when(personRepository.searchByName("clara")).thenReturn(pool);
-        when(personRepository.searchByName("cram")).thenReturn(pool);
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.direct()).containsExactly(direct);
-    }
-
-    @Test
-    void resolveByName_over8Tokens_issuesAtMost8Fetches() {
-        personService.resolveByName("a b c d e f g h i j");
-
-        verify(personRepository, org.mockito.Mockito.atMost(8)).searchByName(any());
-    }
-
-    @Test
-    void resolveByName_samePersonFromTwoTokens_appearsOnce() {
-        // Both token fetches return the same person id — fetchPool's putIfAbsent must dedup so the
-        // candidate is classified once, not twice.
-        Person clara = Person.builder().id(UUID.randomUUID()).firstName("Clara").lastName("Cram").build();
-        when(personRepository.searchByName("clara")).thenReturn(List.of(clara));
-        when(personRepository.searchByName("cram")).thenReturn(List.of(clara));
-
-        NameMatches result = personService.resolveByName("Clara Cram");
-
-        assertThat(result.direct()).hasSize(1);
-        assertThat(result.partial()).isEmpty();
-    }
 }

backend/src/test/java/org/raddatz/familienarchiv/shared/ArchitectureTest.java

@@ -122,8 +122,7 @@ class ArchitectureTest {
             .that().areAnnotatedWith(Entity.class)
             .should().resideInAnyPackage(
                 "..document..", "..person..", "..tag..", "..user..",
-                "..geschichte..", "..notification..", "..ocr..", "..audit..",
-                "..timeline.."
+                "..geschichte..", "..notification..", "..ocr..", "..audit.."
             );
 
     // TODO Rule 5: Controllers expose endpoints under their domain prefix

backend/src/test/java/org/raddatz/familienarchiv/tag/TagServiceTest.java

@@ -666,17 +666,4 @@ class TagServiceTest {
         // verify findAllById was called at least twice: once for extras, once inside resolveEffectiveColors
         verify(tagRepository, atLeastOnce()).findAllById(any());
     }
-
-    // ─── findByNameContaining ─────────────────────────────────────────────────
-
-    @Test
-    void findByNameContaining_delegatesToRepository() {
-        Tag krieg = Tag.builder().id(UUID.randomUUID()).name("Krieg").build();
-        when(tagRepository.findByNameContainingIgnoreCase("krieg")).thenReturn(List.of(krieg));
-
-        List<Tag> result = tagService.findByNameContaining("krieg");
-
-        assertThat(result).containsExactly(krieg);
-        verify(tagRepository).findByNameContainingIgnoreCase("krieg");
-    }
 }

backend/src/test/java/org/raddatz/familienarchiv/timeline/TimelineEventCascadeIntegrationTest.java

@@ -1,95 +0,0 @@
-package org.raddatz.familienarchiv.timeline;
-
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentService;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.person.PersonRepository;
-import org.raddatz.familienarchiv.person.PersonService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Import;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.transaction.annotation.Transactional;
-import software.amazon.awssdk.services.s3.S3Client;
-
-import java.time.LocalDate;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Proves V77's FK {@code ON DELETE CASCADE} on the join tables: deleting a linked Person or
- * Document drops the join row and leaves the {@link TimelineEvent} intact (a person/document
- * delete must never 500 — V71-class regression guard). Needs the full Spring context for
- * {@link PersonService}/{@link DocumentService}, mirroring {@code PersonServiceIntegrationTest}.
- */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
-@ActiveProfiles("test")
-@Import(PostgresContainerConfig.class)
-@Transactional
-class TimelineEventCascadeIntegrationTest {
-
-    @MockitoBean S3Client s3Client;
-    @Autowired TimelineEventRepository events;
-    @Autowired PersonRepository personRepository;
-    @Autowired PersonService personService;
-    @Autowired DocumentRepository documentRepository;
-    @Autowired DocumentService documentService;
-    @Autowired JdbcTemplate jdbc;
-    @PersistenceContext EntityManager em;
-
-    private TimelineEvent.TimelineEventBuilder makeEvent() {
-        return TimelineEvent.builder()
-                .title("Hochzeit von Anna und Otto")
-                .type(EventType.PERSONAL)
-                .eventDate(LocalDate.of(1914, 7, 28))
-                .createdBy(UUID.randomUUID())
-                .updatedBy(UUID.randomUUID());
-    }
-
-    @Test
-    void deleting_linked_person_keeps_event_and_drops_join_row() {
-        Person anna = personRepository.save(Person.builder().firstName("Anna").lastName("Raddatz").build());
-        TimelineEvent event = events.save(makeEvent().persons(Set.of(anna)).build());
-        em.flush();
-        em.clear();
-
-        personService.deletePerson(anna.getId());
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(event.getId())).isPresent();
-        Integer joinRows = jdbc.queryForObject(
-                "SELECT COUNT(*) FROM timeline_event_persons WHERE timeline_event_id = ?",
-                Integer.class, event.getId());
-        assertThat(joinRows).isZero();
-    }
-
-    @Test
-    void deleting_linked_document_keeps_event_and_drops_join_row() {
-        Document letter = documentRepository.save(Document.builder()
-                .title("Brief").originalFilename("brief.pdf").status(DocumentStatus.UPLOADED).build());
-        TimelineEvent event = events.save(makeEvent().documents(Set.of(letter)).build());
-        em.flush();
-        em.clear();
-
-        documentService.deleteDocument(letter.getId(), UUID.randomUUID());
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(event.getId())).isPresent();
-        Integer joinRows = jdbc.queryForObject(
-                "SELECT COUNT(*) FROM timeline_event_documents WHERE timeline_event_id = ?",
-                Integer.class, event.getId());
-        assertThat(joinRows).isZero();
-    }
-}

backend/src/test/java/org/raddatz/familienarchiv/timeline/TimelineEventTest.java

@@ -1,202 +0,0 @@
-package org.raddatz.familienarchiv.timeline;
-
-import jakarta.persistence.EntityManager;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.config.FlywayConfig;
-import org.raddatz.familienarchiv.document.DatePrecision;
-import org.raddatz.familienarchiv.document.Document;
-import org.raddatz.familienarchiv.document.DocumentRepository;
-import org.raddatz.familienarchiv.document.DocumentStatus;
-import org.raddatz.familienarchiv.person.Person;
-import org.raddatz.familienarchiv.person.PersonRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
-import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
-import org.springframework.context.annotation.Import;
-import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * Persistence + DB-constraint tests for {@link TimelineEvent} against real Postgres (V77).
- * Mirrors {@code MigrationIntegrationTest}'s slice setup; never H2 — only the real DB proves
- * enum-as-varchar storage, the RANGE/UNKNOWN CHECK constraints, FK cascade, and {@code @Version}.
- */
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-@Import({PostgresContainerConfig.class, FlywayConfig.class})
-class TimelineEventTest {
-
-    @Autowired TimelineEventRepository events;
-    @Autowired PersonRepository persons;
-    @Autowired DocumentRepository documents;
-    @Autowired EntityManager em;
-
-    /**
-     * Sensible defaults; each test overrides only what it asserts. {@code createdBy}/{@code updatedBy}
-     * default to random UUIDs — both columns are NOT NULL and not auto-populated, so without these
-     * every test would fail at flush with the same constraint violation (red for the wrong reason).
-     * Precision is intentionally left unset so {@code @Builder.Default YEAR} can be exercised.
-     */
-    private TimelineEvent.TimelineEventBuilder makeEvent() {
-        return TimelineEvent.builder()
-                .title("Hochzeit von Anna und Otto")
-                .type(EventType.PERSONAL)
-                .eventDate(LocalDate.of(1914, 7, 28))
-                .createdBy(UUID.randomUUID())
-                .updatedBy(UUID.randomUUID());
-    }
-
-    @Test
-    void persists_and_loads_event_with_required_fields() {
-        TimelineEvent saved = events.save(makeEvent().build());
-
-        assertThat(saved.getId()).isNotNull();
-    }
-
-    @Test
-    void precision_defaults_to_YEAR_when_not_set() {
-        TimelineEvent saved = events.save(makeEvent().build());
-
-        assertThat(saved.getPrecision()).isEqualTo(DatePrecision.YEAR);
-    }
-
-    @Test
-    void persists_event_with_linked_persons() {
-        Person anna = persons.save(Person.builder().firstName("Anna").lastName("Raddatz").build());
-        TimelineEvent saved = events.save(makeEvent().persons(Set.of(anna)).build());
-        em.flush();
-        em.clear();
-
-        TimelineEvent reloaded = events.findById(saved.getId()).orElseThrow();
-        assertThat(reloaded.getPersons()).extracting(Person::getId).containsExactly(anna.getId());
-    }
-
-    @Test
-    void persists_event_with_linked_documents() {
-        Document letter = documents.save(Document.builder()
-                .title("Brief").originalFilename("brief.pdf").status(DocumentStatus.UPLOADED).build());
-        TimelineEvent saved = events.save(makeEvent().documents(Set.of(letter)).build());
-        em.flush();
-        em.clear();
-
-        TimelineEvent reloaded = events.findById(saved.getId()).orElseThrow();
-        assertThat(reloaded.getDocuments()).extracting(Document::getId).containsExactly(letter.getId());
-    }
-
-    @Test
-    void eventDateEnd_round_trips_null_for_non_range() {
-        TimelineEvent saved = events.save(makeEvent().build()); // YEAR precision, no end
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(saved.getId()).orElseThrow().getEventDateEnd()).isNull();
-    }
-
-    @Test
-    void eventDateEnd_round_trips_value_for_range() {
-        TimelineEvent saved = events.save(makeEvent()
-                .precision(DatePrecision.RANGE)
-                .eventDate(LocalDate.of(1914, 1, 1))
-                .eventDateEnd(LocalDate.of(1918, 12, 31))
-                .build());
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(saved.getId()).orElseThrow().getEventDateEnd())
-                .isEqualTo(LocalDate.of(1918, 12, 31));
-    }
-
-    @Test
-    void description_round_trips_null() {
-        TimelineEvent saved = events.save(makeEvent().build());
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(saved.getId()).orElseThrow().getDescription()).isNull();
-    }
-
-    @Test
-    void description_round_trips_multi_kb_text() {
-        // Proves TEXT has no length cap — @Column(columnDefinition = "TEXT") overrides
-        // Hibernate's default VARCHAR(255).
-        String longText = "Sommertage am See. ".repeat(500); // ~9.5 KB
-        TimelineEvent saved = events.save(makeEvent().description(longText).build());
-        em.flush();
-        em.clear();
-
-        assertThat(events.findById(saved.getId()).orElseThrow().getDescription()).isEqualTo(longText);
-    }
-
-    @Test
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    void range_invariant_rejects_non_null_end_without_range_precision() {
-        // precision YEAR + non-null end violates chk_timeline_event_range.
-        try {
-            assertThatThrownBy(() -> events.saveAndFlush(makeEvent()
-                    .eventDateEnd(LocalDate.of(1918, 12, 31))
-                    .build()))
-                    .isInstanceOf(DataIntegrityViolationException.class);
-        } finally {
-            events.deleteAll(); // NOT_SUPPORTED opts out of the rollback; clean any leaked row
-        }
-    }
-
-    @Test
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    void range_invariant_rejects_range_precision_without_end_date() {
-        // precision RANGE + null end violates chk_timeline_event_range.
-        try {
-            assertThatThrownBy(() -> events.saveAndFlush(makeEvent()
-                    .precision(DatePrecision.RANGE)
-                    .build()))
-                    .isInstanceOf(DataIntegrityViolationException.class);
-        } finally {
-            events.deleteAll();
-        }
-    }
-
-    @Test
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    void unknown_precision_is_rejected() {
-        // chk_timeline_event_precision forbids UNKNOWN — curated events are never undated.
-        try {
-            assertThatThrownBy(() -> events.saveAndFlush(makeEvent()
-                    .precision(DatePrecision.UNKNOWN)
-                    .build()))
-                    .isInstanceOf(DataIntegrityViolationException.class);
-        } finally {
-            events.deleteAll();
-        }
-    }
-
-    @Test
-    void version_is_null_before_persist_and_zero_after_save() {
-        TimelineEvent fresh = makeEvent().build();
-        assertThat(fresh.getVersion()).isNull(); // @Version Long is null pre-persist
-
-        TimelineEvent saved = events.saveAndFlush(fresh);
-        assertThat(saved.getVersion()).isEqualTo(0L); // Hibernate sets 0 on insert
-    }
-
-    @ParameterizedTest
-    @EnumSource(value = DatePrecision.class, names = {"DAY", "MONTH", "SEASON", "YEAR", "APPROX"})
-    void all_non_unknown_precisions_are_accepted(DatePrecision precision) {
-        // Accept-side of chk_timeline_event_precision: every non-RANGE, non-UNKNOWN value persists.
-        // Documents that SEASON ("Sommer 1914") and APPROX ("ca. 1914") are intentionally legal,
-        // so an over-tight CHECK cannot ship green. (RANGE is covered by the round-trip test.)
-        TimelineEvent saved = events.saveAndFlush(makeEvent().precision(precision).build());
-
-        assertThat(saved.getId()).isNotNull();
-    }
-}

docker-compose.yml

@@ -141,6 +141,65 @@ services:
     security_opt:
       - no-new-privileges:true
 
+  # --- Ollama: Model init (one-shot pull) ---
+  # Pulls qwen2.5:7b-instruct-q4_K_M (~4.7 GB) into the ollama_models volume on first start.
+  # On subsequent starts (model already in volume), exits quickly without re-downloading.
+  # Not started in CI — CI uses explicit service selection
+  # (docker-compose.ci.yml: db minio create-buckets)
+  ollama-model-init:
+    image: ollama/ollama:0.30.6
+    restart: "no"
+    networks:
+      - archiv-net
+    volumes:
+      - ollama_models:/root/.ollama
+    mem_limit: 2g
+    read_only: true
+    tmpfs:
+      - /tmp:size=512m
+    cap_drop:
+      - ALL
+    security_opt:
+      - no-new-privileges:true
+    command: >
+      sh -c "ollama serve & SERVE_PID=$$! && until curl -sf http://localhost:11434/api/tags; do sleep 1; done && ollama pull qwen2.5:7b-instruct-q4_K_M && kill $$SERVE_PID"
+
+  # --- Ollama: LLM inference server ---
+  # Serves the pre-pulled model for NL search inference.
+  # Not started in CI — CI uses explicit service selection
+  # (docker-compose.ci.yml: db minio create-buckets)
+  ollama:
+    image: ollama/ollama:0.30.6
+    container_name: archive-ollama
+    restart: unless-stopped
+    expose:
+      - "11434"
+    networks:
+      - archiv-net
+    volumes:
+      - ollama_models:/root/.ollama
+    environment:
+      OLLAMA_API_KEY: "${OLLAMA_API_KEY}"
+    cpus: "${OLLAMA_CPU_LIMIT:-4.0}"
+    mem_limit: "${OLLAMA_MEM_LIMIT:-8g}"
+    memswap_limit: "${OLLAMA_MEM_LIMIT:-8g}"
+    read_only: true
+    tmpfs:
+      - /tmp:size=512m
+    cap_drop:
+      - ALL
+    security_opt:
+      - no-new-privileges:true
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:11434/api/tags"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 60s  # model weights are pre-loaded by ollama-model-init; service only needs to bind port
+    depends_on:
+      ollama-model-init:
+        condition: service_completed_successfully
+
   # --- Backend: Spring Boot ---
   backend:
     build:
@@ -184,6 +243,8 @@ services:
       SPRING_MAIL_PROPERTIES_MAIL_SMTP_STARTTLS_ENABLE: ${MAIL_STARTTLS_ENABLE:-false}
       APP_OCR_BASE_URL: http://ocr-service:8000
       APP_OCR_TRAINING_TOKEN: "${OCR_TRAINING_TOKEN:-}"
+      APP_OLLAMA_BASE_URL: "${APP_OLLAMA_BASE_URL:-http://ollama:11434}"
+      APP_OLLAMA_API_KEY: "${OLLAMA_API_KEY}"
       SENTRY_DSN: ${SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${SENTRY_TRACES_SAMPLE_RATE:-1.0}
       # Observability: send traces to Tempo inside archiv-net (OTLP gRPC port 4317)
@@ -247,3 +308,4 @@ volumes:
   frontend_node_modules:
   ocr_models:
   ocr_cache:
+  ollama_models:

docs/ARCHITECTURE.md

@@ -38,7 +38,7 @@ Both stacks are organised **package-by-domain**: each domain owns its entities,
 
 **`user`** — login accounts and permission groups. Owns `AppUser`, `UserGroup`, invite tokens. Does NOT own `Person` records. Cross-domain deps: `audit` (user management events).
 
-**`geschichte`** — family stories and Lesereisen. Owns `Geschichte` (`DRAFT → PUBLISHED` lifecycle) and `JourneyItem` (document attachments / editorial notes shared by both subtypes — no application-level type guard). Two subtypes: `STORY` (prose + attached documents) and `JOURNEY` (ordered curated sequence). Cross-domain deps: `person` (linked persons), `document` (via `JourneyItem.document_id`, ON DELETE SET NULL). See ADR-037.
+**`geschichte`** — family stories. Owns `Geschichte` (`DRAFT → PUBLISHED` lifecycle). Cross-domain deps: `person`, `document` (linked entities in the story body).
 
 **`notification`** — in-app messages. Owns `Notification`. Delivers via `SseEmitterRegistry` (live) and persisted rows (bell dropdown). Cross-domain deps: `user` (recipient), `document` (context).
 
@@ -61,7 +61,7 @@ Members of the cross-cutting layer have no entity of their own, no user-facing C
 | `audit` | Append-only event store (`audit_log`) for all domain mutations. Feeds the activity feed and Family Pulse dashboard. | Consumed by 5+ domains; no user-facing CRUD of its own |
 | `config` | Infrastructure bean definitions: `MinioConfig`, `AsyncConfig`, `WebConfig` | Framework infra; no business logic |
 | `dashboard` | Stats aggregation for the admin dashboard and Family Pulse widget | Aggregates from 3+ domains; no owned entities |
-| `exception` | `DomainException`, `ErrorCode` enum, `GlobalExceptionHandler` | Framework infra; consumed by every controller and service. Adding a new `ErrorCode` requires matching updates in `frontend/src/lib/shared/errors.ts` and all three `messages/*.json` locale files. Current security-related codes: `CSRF_TOKEN_MISSING` (403 on mutating request without valid `X-XSRF-TOKEN` header), `TOO_MANY_LOGIN_ATTEMPTS` (429 when login rate limit exceeded). Journey/geschichte domain codes: `JOURNEY_NOTE_TOO_LONG`, `JOURNEY_DOCUMENT_ALREADY_ADDED`, `GESCHICHTE_TYPE_IMMUTABLE`, `GESCHICHTE_TITLE_TOO_LONG`, `GESCHICHTE_INTRO_TOO_LONG`. |
+| `exception` | `DomainException`, `ErrorCode` enum, `GlobalExceptionHandler` | Framework infra; consumed by every controller and service. Adding a new `ErrorCode` requires matching updates in `frontend/src/lib/shared/errors.ts` and all three `messages/*.json` locale files. Current security-related codes: `CSRF_TOKEN_MISSING` (403 on mutating request without valid `X-XSRF-TOKEN` header), `TOO_MANY_LOGIN_ATTEMPTS` (429 when login rate limit exceeded). |
 | `filestorage` | `FileService` — MinIO/S3 upload, download, presigned-URL generation | Generic service; consumed by `document` and `ocr` |
 | `importing` | `CanonicalImportOrchestrator` — async canonical import running four idempotent loaders (`TagTreeImporter` → `PersonRegisterImporter` → `PersonTreeImporter` → `DocumentImporter`) over the normalizer's committed canonical artifacts (`canonical-*.xlsx` + `canonical-persons-tree.json`) | Orchestrates across `person`, `tag`, `document` |
 | `security` | `SecurityConfig`, `Permission` enum, `@RequirePermission` annotation, `PermissionAspect` (AOP) | Framework infra; enforced globally across all controllers |

docs/DEPLOYMENT.md

@@ -50,14 +50,15 @@ graph TD
 
 The OCR service requires significant RAM for model loading. The dev compose sets `mem_limit: 12g`.
 
-| Production target | RAM | Recommended OCR limit | Notes |
-|---|---|---|---|
-| Current server (Hetzner Serverbörse, i7-6700) | 64 GB | 12 GB | Default `mem_limit: 12g` works comfortably |
-| ≥ 16 GB RAM | 16+ GB | 12 GB | Default works |
-| 8 GB RAM | 8 GB | 6 GB | Set `OCR_MEM_LIMIT=6g`; accept reduced batch sizes |
-| 4 GB RAM | 4 GB | — | Disable OCR service (`profiles: [ocr]`); run OCR on demand only |
+| Production target | RAM | Recommended OCR limit | NL Search | Notes |
+|---|---|---|---|---|
+| Hetzner CX42 | 16 GB | 12 GB | Supported (Ollama 8 GB + OCR 6 GB active ≈ 14 GB) | Recommended for OCR-enabled production |
+| Hetzner CX32 | 8 GB | 6 GB | Disabled — set `APP_OLLAMA_BASE_URL=` (empty) | Accept reduced batch sizes and slower throughput |
+| Hetzner CX22 | 4 GB | — | Unsupported | Disable the OCR service (`profiles: [ocr]`); run OCR on demand only |
 
-On servers with less than 16 GB RAM the default `mem_limit: 12g` cannot be honoured — set the `OCR_MEM_LIMIT` env var (in `.env.production` / `.env.staging`, or as a Gitea secret consumed by the workflow). The prod compose interpolates this var with a 12g default.
+A CX32 cannot honour the default `mem_limit: 12g` — set the `OCR_MEM_LIMIT=6g` env var (in `.env.production` / `.env.staging`, or as a Gitea secret consumed by the workflow) before deploying on a CX32. The prod compose interpolates this var with a 12g default.
+
+> **Memory budget (CX42):** OCR (~6 GB active) + Ollama (~8 GB) = ~14 GB. Do not run `docker-compose.observability.yml` continuously alongside both services on a CX42.
 
 ### Dev vs production differences
 
@@ -124,8 +125,6 @@ All vars are set in `.env` at the repo root (copy from `.env.example`). The back
 | `POSTGRES_PASSWORD` | DB password | `change-me` | YES | YES |
 | `POSTGRES_DB` | Database name | `family_archive_db` | YES | — |
 
-> **PgBouncer pooling mode:** The `journey_items.position_seq` dedup constraint uses `DEFERRABLE INITIALLY DEFERRED`. This requires PgBouncer in **transaction-mode** (not statement-mode) pooling. Do not switch to statement-level pooling — deferred constraints only work within a single transaction session.
-
 ### MinIO container
 
 | Variable | Purpose | Default | Required? | Sensitive? |
@@ -143,10 +142,20 @@ All vars are set in `.env` at the repo root (copy from `.env.example`). The back
 | `ALLOWED_PDF_HOSTS` | SSRF protection — comma-separated list of allowed PDF source hosts. **Do not widen to `*`** | `minio,localhost,127.0.0.1` | YES | — |
 | `KRAKEN_MODEL_PATH` | Directory containing Kraken HTR models (populated by `download-kraken-models.sh`) | `/app/models/` | — | — |
 | `BLLA_MODEL_PATH` | Kraken baseline layout analysis model path | `/app/models/blla.mlmodel` | — | — |
-| `OCR_MEM_LIMIT` | Container memory cap for ocr-service in `docker-compose.prod.yml`. Set to `6g` on servers with 8 GB RAM; leave unset (12g default) on servers with ≥ 16 GB RAM | `12g` (prod compose default) | — | — |
+| `OCR_MEM_LIMIT` | Container memory cap for ocr-service in `docker-compose.prod.yml`. Set to `6g` on CX32 hosts; leave unset on CX42+ to use the 12g default | `12g` (prod compose default) | — | — |
 | `XDG_CACHE_HOME` | XDG cache base dir — redirects Matplotlib and other XDG-aware libraries away from the read-only `HOME` (`/home/ocr`) to the writable cache volume | `/app/cache` | — | — |
 | `TORCH_HOME` | PyTorch model cache — redirects `~/.cache/torch` to the writable models volume | `/app/models/torch` | — | — |
 
+### Ollama (NL search) service
+
+| Variable | Purpose | Default | Required? | Sensitive? |
+|---|---|---|---|---|
+| `APP_OLLAMA_BASE_URL` | Base URL for the Ollama service. Leave empty to disable NL search. | `http://ollama:11434` | — | — |
+| `APP_OLLAMA_API_KEY` | API key passed as `Authorization: Bearer` to Ollama. Leave empty for unauthenticated access. Note: `OLLAMA_API_KEY` is not enforced in Ollama 0.6.5 or 0.30.6 (see ADR-028). | — | — | YES |
+| `OLLAMA_CPU_LIMIT` | Docker CPU quota for the Ollama container. On CX42 (8 vCPUs) can be raised to `7.5`. | `4.0` | — | — |
+| `OLLAMA_MEM_LIMIT` | Memory limit for the Ollama container. Requires CX42 (16 GB RAM). | `8g` | — | — |
+| `OLLAMA_API_KEY` | API key set on the Ollama service itself. Same value as `APP_OLLAMA_API_KEY`. Leave empty for unauthenticated. | — | — | YES |
+
 ### Observability stack (`docker-compose.observability.yml`)
 
 | Variable | Purpose | Default | Required? | Sensitive? |
@@ -267,6 +276,18 @@ git.raddatz.cloud      A   <server IP>
 
 ### 3.4 First deploy
 
+> **First start — Ollama model pull:** On first `docker compose up -d`, the `ollama-model-init` container pulls `qwen2.5:7b-instruct-q4_K_M` (~4.7 GB). At 10 Mbps this takes approximately 60–90 minutes; at 100 Mbps approximately 6–10 minutes. The pull is a one-time operation — subsequent restarts skip it (model already on the `ollama_models` volume). Monitor progress with `docker logs -f $(docker ps -q --filter name=ollama-model-init)`.
+>
+> **Do not use `--wait` on first deploy** — `docker compose up -d --wait` waits for all services to reach their health/completion target, including `ollama-model-init`. On first pull this blocks for 60–90 minutes and will time out any CI/deploy script that uses `--wait`.
+>
+> **Re-deploy idempotency:** on subsequent `docker compose up -d` runs (including `--force-recreate`), `ollama-model-init` re-executes but exits in seconds — Ollama's CLI skips the download when the model digest already matches what is on the volume.
+>
+> **Verify NL search is active** after enabling Ollama (`APP_OLLAMA_BASE_URL=http://ollama:11434`):
+> ```bash
+> curl -s http://localhost:8080/api/nl-search?q=brief+von+grossmutter
+> # Returns 200 with results → NL search is active
+> # Returns 503 NL_SEARCH_UNAVAILABLE → Ollama is not reachable or APP_OLLAMA_BASE_URL is unset
+> ```
 
 ```bash
 # 1. Trigger nightly.yml manually (Repo → Actions → nightly → "Run workflow")
@@ -518,26 +539,6 @@ docker exec -i archive-db psql -U ${POSTGRES_USER} ${POSTGRES_DB} < backup-YYYYM
 
 Automated backup (nightly `pg_dump` + MinIO `mc mirror` over Tailscale to `heim-nas`) is a follow-up issue. Until that ships: **manual backups are the only recovery option.**
 
-### Deploy note — V76 (persons birth/death → date + precision, #773)
-
-V76 drops `persons.birth_year`/`death_year` after backfilling the new
-`birth_date`/`death_date` + precision columns — a **one-way migration** (Flyway cannot
-roll it back). Before deploying:
-
-1. Take a manual `pg_dump` (see above) — there is no automated nightly backup yet, so
-   confirm the dump completed before starting the deploy.
-2. No maintenance window is required: the pre-check + DDL run in one atomic Flyway
-   transaction, and this single-writer archive has no concurrent importers during deploy.
-
-If post-deploy data issues are found, restore **only the persons table** from the
-pre-migration dump (targeted restore, not a full-database restore):
-
-```bash
-pg_restore -t persons -d ${POSTGRES_DB} backup-YYYYMMDD.dump
-```
-
-(For a plain-SQL dump, extract the persons COPY block instead of replaying the full file.)
-
 ### Rollback
 
 Each release tag corresponds to a docker image tag on the host daemon (built via DooD; no registry). Rolling back to a previous tag is one command:
@@ -583,6 +584,24 @@ bash scripts/download-kraken-models.sh
 
 > Downloads the Kurrent/Sütterlin HTR models. Run once after a fresh clone or when models are updated.
 
+### Upgrade the Ollama model
+
+To switch to a newer model version (e.g. a future release of `qwen2.5`):
+
+1. Update the model name in the `ollama-model-init` `command:` in `docker-compose.yml`.
+2. Remove the existing model volume to free the old weights:
+   ```bash
+   docker volume rm familienarchiv_ollama_models
+   ```
+   (In production the volume name is prefixed with the compose project: `archiv-production_ollama_models`.)
+3. Restart the stack:
+   ```bash
+   docker compose up -d
+   ```
+   The `ollama-model-init` container pulls the new model weights on first start (~4–8 GB download depending on the model). The `ollama` inference server will not start until the pull completes (`condition: service_completed_successfully`).
+
+> **`ollama_models` volume:** holds model weights only — fully reproducible by re-pull, no backup needed.
+
 ### Trigger a canonical import
 
 The importer no longer parses the raw spreadsheet. It consumes the **canonical artifacts**

docs/GLOSSARY.md

@@ -149,26 +149,7 @@ _See also [Chronik](#chronik-internal)._
 
 **Chronik** `[internal]` — the conceptual and code-level name for the unified activity feed (per ADR-003 `003-chronik-unified-activity-feed.md`). Used in code, architecture documents, and ADRs. The user-facing label for the same concept is [Aktivität](#aktivitat--aktivitaten-user-facing).
 
-**Geschichte** (`Geschichte`) `[user-facing]` — a narrative story or curated document journey published in the archive. Two subtypes: `STORY` (free-form prose linking `Person`s and attaching documents via `journey_items`) and `JOURNEY` (a *Lesereise* — an ordered sequence of `JourneyItem`s). Lifecycle: `DRAFT → PUBLISHED` (see `GeschichteStatus`). DRAFT stories are hidden from users without the `BLOG_WRITE` permission.
-
-**JourneyItem** (`JourneyItem`, table `journey_items`) `[internal]` — a document attachment or editorial note belonging to a `Geschichte` of either subtype. JOURNEY-type Geschichten use items for their ordered reading sequence; STORY-type Geschichten use items to attach referenced documents (no type guard is enforced at the application layer — both subtypes share this table). Either document-backed (`document_id IS NOT NULL`) or a note-only interlude (`note IS NOT NULL`). Ordered by `position` (step of 10; max 100 items per Geschichte). A DEFERRABLE UNIQUE constraint on `(geschichte_id, position)` allows atomic position swaps in the same transaction. A CHECK constraint ensures at least one of `document_id` or `note` is present. The FK to `documents` uses `ON DELETE SET NULL`, so deleting a document preserves the item (with `document_id = null`). See ADR-037.
-
-**GeschichteView** (`GeschichteView`) `[internal]` — lean read-model record returned by `GeschichteService.getById()`. Contains `AuthorView` (id + displayName only — email not exposed) and a `List<JourneyItemView>` loaded via a separate query rather than a lazy collection.
-
-**JourneyItemView** (`JourneyItemView`) `[internal]` — lean view record for a single `JourneyItem` surface, containing `id`, `position`, an optional `DocumentSummary`, and an optional `note`.
-
-**DocumentSummary** (`DocumentSummary`) `[internal]` — lean document read-model used inside `JourneyItemView`. Contains title, date, senderName, receiverName, receiverCount, datePrecision — no tags or file storage info.
-
-**Interlude / Zwischentext** `[user-facing]` — an editorial paragraph inserted between document items in a *Lesereise*. An interlude is a `JourneyItem` with `document_id IS NULL` and a non-empty `note`; its content is a plain-text string stored in the `note` column (not `body` or `text`). Visually distinguished by `--color-interlude-bg/border/label` CSS tokens and a `ZWISCHENTEXT` label. Interludes cannot have their note removed (removing the interlude deletes the entire item).
-_Not to be confused with a document item's optional note_ — a document item's note is curator commentary attached to a linked letter; an interlude is standalone editorial prose with no backing document.
-
-**Lesereise** `[user-facing]` — a curated reading journey through a sequence of family documents, optionally annotated with editorial notes. Implemented as a `Geschichte` with `type=JOURNEY`. The reader UI (follow-on issue) renders items as a sequential reading experience.
-
-**TimelineEvent** (`TimelineEvent`, table `timeline_events`) `[internal]` — a curated event on the family timeline (*Zeitstrahl*), authored by a curator rather than OCR-derived. Carries the same date block as a `Document` (`eventDate` + `precision` + nullable `eventDateEnd`) so events and letters render through one path, plus a `title`, optional `description`, an `EventType`, and `ManyToMany` links to the `Person`s it involves and the `Document`s that support it (both join FKs `ON DELETE CASCADE`). Diverges from `Document` with an optimistic-lock `@Version` and a NOT NULL `createdBy`/`updatedBy` audit trail (bare UUIDs, no FK to `app_users`) for the multi-curator edit flow. Two DB CHECKs: `event_date_end` is non-null **iff** precision is `RANGE` (a strict biconditional, intentionally tighter than `Document`'s open-ended ranges), and `precision` is never `UNKNOWN` (a curated event always has at least a year; `SEASON`/`APPROX` stay legal). See ADR-040.
-
-**EventType** (`EventType`) `[user-facing]` — the kind of a `TimelineEvent`: `PERSONAL` (a family event, rendered with the family accent) or `HISTORICAL` (world/historical context, rendered with a muted world accent). The string value names are a stable frontend styling contract — renaming requires a coordinated frontend change (ADR-040).
-
-**Zeitstrahl** `[user-facing]` — the family timeline view, rendering curated `TimelineEvent`s (and, in later issues, derived life-events) chronologically. The milestone home of the `timeline` domain.
+**Geschichte** (`Geschichte`) `[user-facing]` — a narrative story or article published in the archive, linking `Person`s and `Document`s. Lifecycle: `DRAFT → PUBLISHED` (see `GeschichteStatus`). DRAFT stories are hidden from users without the `BLOG_WRITE` permission.
 
 **Notification** (`Notification`) — an in-app message delivered to an `AppUser`. No email or SMS delivery exists today. Delivered via Server-Sent Events (`SseEmitterRegistry`) and persisted in the `notifications` table.
 
@@ -184,8 +165,6 @@ _Not to be confused with a document item's optional note_ — a document item's
 
 **Domain** — a Tier-1 bounded context with its own entities, controller, service, repository, and DTOs. Backend domains: `document`, `person`, `tag`, `user`, `geschichte`, `notification`, `ocr`, `audit`, `dashboard`. Frontend domains mirror this structure under `src/lib/`.
 
-**NameMatches** — the Person-domain result of `PersonService.resolveByName(name)`: candidate persons split by name-match strength into `direct` and `partial`. A match is **direct** when every query token is a whole-token match (order-independent, alias/maiden-name aware) across all of a person's name components (`firstName`, `lastName`, `alias`, each `PersonNameAlias` first+last, `title`); a **partial** matched the substring fetch but is not direct (e.g. "Cram" → "Clara Cramer").
-
 ---
 
 ## Infrastructure Terms

docs/adr/004-pdfbox-thumbnails.md

@@ -35,7 +35,7 @@ Render thumbnails in-process in Spring Boot using **Apache PDFBox 3.0.4** (alrea
 
 **Harder:**
 - PDFBox is a parser attack surface. Mitigated by a 30-second watchdog timeout in `ThumbnailAsyncRunner` and by the fire-and-forget contract (failures never break upload).
-- Memory ceiling: the `thumbnailExecutor` is capped at 2 threads on memory-constrained hosts. A busy backfill alongside OCR can approach the 3 GB heap on an 8 GB server — acceptable but not comfortable. The current production server (64 GB) has ample headroom. Streaming via `FileService.downloadFileStream` keeps this bounded for PDFs up to 50 MB.
+- Memory ceiling: the `thumbnailExecutor` is capped at 2 threads on the CX32 (8 GB). A busy backfill alongside OCR can approach the 3 GB heap — acceptable but not comfortable. Streaming via `FileService.downloadFileStream` keeps this bounded for PDFs up to 50 MB.
 
 ### Operational caveats (intentional)
 

docs/adr/021-tmpdir-persistent-volume-staging.md

@@ -62,7 +62,7 @@ The `/tmp` tmpfs remains at 512 MB and continues to serve training-ZIP extractio
 ## Alternatives considered
 
 **Approach B — Enlarge `/tmp` to 4 GB**  
-One-line change. Discarded because: (1) 4 GB tmpfs counts against the cgroup `mem_limit`; on servers with `OCR_MEM_LIMIT=6g` the combined Surya resident set + tmpfs would trigger OOMKill on cold start; (2) staging GB-scale model files through RAM is using the wrong storage tier; (3) any future model larger than 4 GB requires another bump.
+One-line change. Discarded because: (1) 4 GB tmpfs counts against the cgroup `mem_limit`; on CX32 hosts with `OCR_MEM_LIMIT=6g` the combined Surya resident set + tmpfs would trigger OOMKill on cold start; (2) staging GB-scale model files through RAM is using the wrong storage tier; (3) any future model larger than 4 GB requires another bump.
 
 **Approach C — Both TMPDIR redirect and enlarged /tmp**  
 Belt-and-suspenders: Approach A + 1 GB tmpfs. Discarded in favour of the cleaner Approach A. The defence-in-depth benefit does not outweigh the extra compose churn; the 512 MB cap on `/tmp` is intentional.

docs/adr/028-ollama-docker-compose-service.md

@@ -0,0 +1,239 @@
+# ADR-028: Ollama Docker Compose service for NL search
+
+**Date:** 2026-06-06
+**Status:** Accepted
+**Deciders:** Marcel Raddatz
+**Relates to:** #737 (infrastructure), #735 (NL search epic)
+
+---
+
+## Context
+
+Issue #735 introduces natural-language document search, requiring a local LLM to generate embeddings and/or run inference at query time. The family archive stores personal family history — data privacy is non-negotiable, so cloud-based inference APIs are excluded. The production target is a Hetzner CX42 (16 GB RAM, 8 vCPUs, CPU-only, ~32 EUR/month).
+
+Alternatives considered:
+
+| Option | Reason rejected |
+|---|---|
+| **llama.cpp** | No HTTP API out of the box; requires custom wrapper; higher ops burden |
+| **vLLM** | GPU-first; significant overhead on CPU-only hardware; overkill for this scale |
+| **Cloud APIs** (OpenAI, Gemini, etc.) | Vendor lock-in; per-token cost at scale; data leaves the server — unacceptable for a private family archive |
+| **Ollama** | Self-contained Docker image; built-in HTTP REST API; actively maintained; CPU-compatible; zero egress |
+
+**Decision:** run Ollama as a Docker Compose service alongside the existing stack.
+
+---
+
+## Decisions
+
+### 1. Hardware minimums and CPU-only constraint
+
+All inference runs on CPU. The target is the Hetzner CX42 (16 GB RAM, 8 vCPUs).
+
+| Tier | RAM | NL search |
+|---|---|---|
+| CX42 | 16 GB | Supported — full stack including Ollama |
+| CX32 | 8 GB | Disabled — set `APP_OLLAMA_BASE_URL=` (empty) to skip Ollama entirely |
+| CX22 | 4 GB | Unsupported for NL search |
+
+### 2. Memory budget on CX42
+
+| Component | `mem_limit` | Typical active RSS |
+|---|---|---|
+| OCR service | 12g (hard ceiling) | ~6 GB |
+| Ollama | 8g | ~8 GB |
+| **Total** | | **~14 GB active** |
+
+`memswap_limit` on the Ollama service is set to `8g` (matching `mem_limit`) to prevent Linux from swapping model weights into swap under OCR memory pressure. Swapping model weights does not crash the container but silently degrades inference latency. This mirrors the pattern already applied to the OCR service.
+
+**Operational constraint:** do NOT run `docker-compose.observability.yml` continuously alongside both OCR and Ollama on a CX42. The observability stack adds ~2 GB, which leaves no headroom.
+
+### 3. Graceful-degradation contract
+
+`app.ollama.base-url` absent OR blank → Ollama bean NOT registered → NL search returns HTTP 503 with `ErrorCode: NL_SEARCH_UNAVAILABLE`.
+
+This single code path covers all unavailability scenarios: base-url unset, service unreachable, health check failed, and request timeout.
+
+#### Why not `@ConditionalOnProperty`
+
+`@ConditionalOnProperty` registers the bean when the property is present but blank (`APP_OLLAMA_BASE_URL=`). This produces a `RestClient` with an empty base URL that fails at runtime with an opaque error rather than a clean 503.
+
+#### Correct condition expression
+
+```java
+@ConditionalOnExpression("!'${app.ollama.base-url:}'.isBlank()")
+```
+
+When the property is absent, the placeholder resolves to `''`; `.isBlank()` returns `true`; negation makes the condition `false`; the bean is not registered. Same result for an explicit empty string (`APP_OLLAMA_BASE_URL=`).
+
+### 4. Backend configuration pattern
+
+Use a `@ConfigurationProperties` record, not separate `@Value` injections:
+
+```java
+@ConfigurationProperties("app.ollama")
+record OllamaProperties(String baseUrl, String apiKey) {}
+```
+
+`OllamaProperties` is registered unconditionally — it is a plain value holder with no side effects.
+
+`@ConditionalOnExpression` belongs **only** on `RestClientOllamaClient` (the bean that creates a live network client).
+
+**Deliberate divergence from the OCR pattern:** the OCR service uses `@Value`-with-default because OCR is always-on and `http://ocr-service:8000` is a safe default. Ollama is truly optional — a missing URL means "feature disabled", not "use this default server". There is no safe default Ollama URL.
+
+### 5. Optional<OllamaClient> injection
+
+The NL search service uses constructor injection with `Optional<OllamaClient>`:
+
+```java
+private final Optional<OllamaClient> ollamaClient;
+```
+
+When empty (bean not registered), the service method returns 503 immediately:
+
+```java
+var client = ollamaClient.orElseThrow(
+    () -> DomainException.internal(ErrorCode.NL_SEARCH_UNAVAILABLE, "Ollama not configured"));
+```
+
+Prefer this over `@Autowired(required = false)` with a null check — the null-check pattern is noisy when the service already uses `@RequiredArgsConstructor`.
+
+### 6. Empty API key guard
+
+`RestClientOllamaClient` omits the `Authorization` header entirely when `apiKey` is blank:
+
+```java
+if (!apiKey.isBlank()) {
+    request.header("Authorization", "Bearer " + apiKey);
+}
+```
+
+Sending `Authorization: Bearer ` (empty token) has undefined or potentially broken behavior depending on the Ollama version. This mirrors the `trainingToken` guard in `RestClientOcrClient.java:107`.
+
+### 7. OLLAMA_API_KEY behavior in Ollama 0.6.5 and 0.30.6
+
+**Empirically verified (2026-06-06) on both `0.6.5` and `0.30.6`:** `OLLAMA_API_KEY` does **not** enforce request authentication in either version.
+
+Test matrix run against `/api/tags`:
+
+| Configuration | No auth header | `Authorization: Bearer ` (empty) | `Authorization: Bearer wrongkey` | `Authorization: Bearer correctkey` |
+|---|---|---|---|---|
+| `OLLAMA_API_KEY=` (empty) | 200 | 200 | — | — |
+| `OLLAMA_API_KEY` unset | 200 | — | — | — |
+| `OLLAMA_API_KEY=testkey99` | 200 | 200 | 200 | 200 |
+
+**Finding:** The `OLLAMA_API_KEY` environment variable is not listed in Ollama's startup config dump and does not gate any HTTP request in either tested version. All configurations — empty string, fully unset, and a real key — accept all requests without authentication.
+
+**Practical implication:** `OLLAMA_API_KEY` provides no defense-in-depth in the tested versions. `archiv-net` network isolation is the only effective security control. The env var is retained in the Compose definition and `.env.example` for forward compatibility if Ollama enables enforcement in a future version, but operators must not rely on it for access control.
+
+**Backend guard still valid:** the `RestClientOllamaClient` code-level guard (omit `Authorization` header when `apiKey.isBlank()`) remains correct behavior regardless — it prevents a malformed `Authorization: Bearer ` header from being sent.
+
+### 8. read_only: true feasibility
+
+**Empirically verified (2026-06-06) on both `0.6.5` and `0.30.6`:** `read_only: true` works with Ollama. All three operations — `ollama serve`, `ollama pull qwen2.5:7b-instruct-q4_K_M`, and `ollama list` — succeeded with exit code 0 in both versions.
+
+Test run:
+```bash
+docker run --rm --read-only \
+  -v ollama_models:/root/.ollama \
+  --tmpfs /tmp \
+  --entrypoint sh ollama/ollama:0.30.6 \
+  -c "ollama serve & sleep 5 && ollama pull qwen2.5:7b-instruct-q4_K_M && ollama list"
+```
+
+**Note:** the entrypoint must be overridden to `sh` for the test command — the container's default entrypoint is `/bin/ollama` and does not accept `sh` as a subcommand. This is a Docker invocation detail; the Compose service definition uses the image's default entrypoint and `command:` override for the init container, which works correctly.
+
+**Result:** `read_only: true` and `tmpfs: - /tmp:size=512m` are applied to both `ollama` and `ollama-model-init`. The `ollama_models` volume handles all persistent writes; no other paths require write access during normal operation.
+
+### 9. Peak RSS of init container during pull
+
+**Empirically verified (2026-06-06):** Peak RSS during `qwen2.5:7b-instruct-q4_K_M` pull was **~108 MiB**.
+
+`docker stats` samples during the pull (15-second intervals):
+
+| Sample | MEM |
+|---|---|
+| 1 | 54.89 MiB |
+| 2 | 66.3 MiB |
+| 5 | 97.25 MiB |
+| 9 | **107.8 MiB** (peak) |
+
+`mem_limit: 2g` is adequate — the model weights stream directly to the named volume; RSS is dominated by the Ollama server process alone (~100 MB), not the model data. No bump to 4 GB needed.
+
+### 10. Init container pull mechanism
+
+The `ollama-model-init` container uses a curl-based readiness loop with captured PID:
+
+```sh
+ollama serve & SERVE_PID=$!
+until curl -sf http://localhost:11434/api/tags; do sleep 1; done
+ollama pull qwen2.5:7b-instruct-q4_K_M
+kill $SERVE_PID
+```
+
+`kill %1` (job-control syntax) is unreliable in non-interactive `sh -c` contexts. Capturing the PID via `SERVE_PID=$!` is reliable.
+
+The same endpoint (`/api/tags`) is used for both the init container readiness loop and the main service `healthcheck`.
+
+### 11. start_period: 60s rationale
+
+The model is pre-pulled by `ollama-model-init` before the main service starts (via `condition: service_completed_successfully`). At main service startup, Ollama only loads model weights from the named volume and binds port 11434.
+
+60 seconds is appropriate for this cold-start profile. 300 seconds was considered — that would be appropriate if the service pulled the model itself — but overstates actual startup time when the model is already present on the volume.
+
+### 12. Security threat model
+
+**Primary control:** `archiv-net` network isolation. Ollama has no externally exposed port (`expose:` only, not `ports:`). The Caddyfile must not route any path to the Ollama service.
+
+**Note on `OLLAMA_API_KEY`:** Per §7, `OLLAMA_API_KEY` is not enforced in Ollama 0.6.5 or 0.30.6 and provides no authentication barrier against a compromised backend container. `archiv-net` network isolation is the sole effective security control. The env var is retained for forward compatibility only — do not rely on it for access control.
+
+Both `ollama` and `ollama-model-init` receive the ADR-019 hardening baseline:
+
+```yaml
+cap_drop: [ALL]
+security_opt: [no-new-privileges:true]
+```
+
+### 13. CI exclusion strategy
+
+Docker Compose profiles are not used — they would add developer friction (requiring `--profile ...` for all local dev commands).
+
+CI uses explicit service selection in `docker-compose.ci.yml`:
+```bash
+docker compose -f docker-compose.ci.yml up -d db minio create-buckets
+```
+
+Ollama is simply not listed and is never started in CI. A YAML comment on the `ollama` service block documents this:
+
+```yaml
+# Not started in CI — CI uses explicit service selection
+# (docker-compose.ci.yml: db minio create-buckets)
+```
+
+### 14. ollama_models volume operational note
+
+The `ollama_models` named volume holds model weights only — fully reproducible by re-pull. No backup is needed.
+
+If the volume fills after a model upgrade:
+```bash
+docker volume rm ollama_models && docker compose up -d
+```
+The init container re-pulls the model on next startup.
+
+---
+
+## Consequences
+
+### Positive
+
+- NL search runs entirely on-premises; no data leaves the server and no per-token cloud cost.
+- Graceful degradation is a first-class concern: smaller or budget-constrained instances can run the app without Ollama with a single env var change.
+- The init container pattern keeps model pull out of the critical startup path for the main service, giving accurate healthcheck timings.
+- `@ConditionalOnExpression` with a blank-check is more correct than `@ConditionalOnProperty` for optional features with no safe default URL.
+
+### Risks and operational implications
+
+- **Memory pressure:** OCR + Ollama together consume ~14 GB on a 16 GB host. Running the observability stack simultaneously risks OOM kills. Monitor with `docker stats`.
+- **CPU inference latency:** `qwen2.5:7b-instruct-q4_K_M` is chosen for CPU viability, but inference on 8 vCPUs will be noticeably slower than GPU-accelerated alternatives. This is acceptable for the family archive use case (low concurrency, not real-time).
+- All three empirical TBD items from the original issue spec were resolved — see §7 (OLLAMA_API_KEY not enforced), §8 (`read_only: true` works), §9 (peak RSS ~108 MiB).
+- Model upgrades require a `docker volume rm` to free old weights before pulling the replacement. Document this in runbook/DEPLOYMENT.md.

docs/adr/032-tag-name-resolution-tolerates-case-collisions.md

@@ -1,4 +1,4 @@
-# ADR-033 — Tag-name resolution tolerates case-collisions: exact-case first, then a deterministic lowest-id fallback, and never a `unique(lower(name))` constraint
+# ADR-032 — Tag-name resolution tolerates case-collisions: exact-case first, then a deterministic lowest-id fallback, and never a `unique(lower(name))` constraint
 
 **Date:** 2026-06-06
 **Status:** Accepted
@@ -82,58 +82,15 @@ added later.
   `IncorrectResultSizeDataAccessException`, and `GlobalExceptionHandler`'s generic handler maps
   any stray one to `INTERNAL_ERROR` with no Hibernate/SQL leak — so no dedicated handler was
   added.
-- **The sibling Person path is fixed the same way — see the Person extension below (#731).**
+- **The sibling Person path is unfixed but tracked.** `PersonService.findOrCreateByAlias`
+  (`findByAliasIgnoreCase`) and `findByFirstNameIgnoreCaseAndLastNameIgnoreCase` carry the same
+  latent `Optional`-non-unique throw on user-influenced names; deferred to #731 rather than
+  widened into this fix.
 - Postgres `LOWER()` folding of umlauts (`ü`/`ä`) is the actual correctness hinge of the
   fallback and cannot be proven by a mocked repo, so it is pinned by a Testcontainers
   `postgres:16-alpine` test on a `Glückwünsche`/`glückwünsche` pair; a plain-ASCII test would
   stay green while the bug reappeared for umlaut tags.
 
-## Person extension (#731)
-
-The Person domain carried the same latent throw on **two** user-influenced lookup surfaces, and
-is fixed with the same exact-case-first, non-throwing pattern — but with a deliberately
-**different fallback per surface**, because the two paths have different consequences.
-
-- **Alias path — `PersonService.findOrCreateByAlias` — deterministic lowest-id (mirrors tag).**
-  `findByAliasIgnoreCase` (`Optional`) is replaced by `findByAlias` (exact) → `findAllByAliasIgnoreCase`
-  (plural, lowest id) → the existing create-when-absent branch (INSTITUTION/GROUP and the
-  maiden-name alias are preserved verbatim). There is no human in the importer loop and the path
-  creates-on-absent anyway, so a deterministic guess is the right behaviour — exactly like tags.
-
-- **Name/sender path — `PersonService.findByName` — bail to null on ambiguity (the new wrinkle).**
-  Used only by `DocumentService.storeDocument` to resolve the upload **sender** from the parsed
-  filename. `findByFirstNameIgnoreCaseAndLastNameIgnoreCase` (`Optional`) is replaced by
-  `findByFirstNameAndLastName` (exact) → `findAllByFirstNameIgnoreCaseAndLastNameIgnoreCase`
-  (plural). Resolution returns the exact-case match, else the single case-insensitive match, else
-  — on **two or more** matches — **empty**. The sender is left unset rather than guessing.
-
-  **Why this diverges from the alias (and tag) decision:** the archive's value is correct
-  provenance. A confidently-wrong pre-filled `Hans Müller` is worse than an empty field, because a
-  senior reviewer will not re-check a value that is already filled in, whereas an empty sender
-  routes the document into the "needs completion" state (`metadataComplete=false`) for a human to
-  assign. The load-bearing comment at `findByName` records this so a future "consistency cleanup"
-  does not reintroduce the confidently-wrong-sender bug by switching it to lowest-id.
-
-- **Fail-closed on a null first name.** A parsed filename can lack a first name. The two new name
-  methods use explicit HQL equality (`= :firstName`) rather than a derived
-  `…IgnoreCase` query, because Spring Data folds a null derived-query argument to `first_name IS
-  NULL` — which would silently widen the match and pull a last-name-only / institution row in as a
-  "sender" (a quiet provenance-integrity defect). With HQL equality a null binds as `= NULL`,
-  which never matches, so a null first name resolves to **no sender**. This is pinned by a
-  real-Postgres repository test.
-
-- **Scope — "ambiguous" is case-insensitive only.** Both exact-case lookups (`findByAlias`,
-  `findByFirstNameAndLastName`) return `Optional`, so two **byte-identical same-case** rows would
-  still throw `NonUniqueResultException`. That is a true data anomaly, deliberately out of scope
-  (it is not a case-collision), and it surfaces as the opaque `INTERNAL_ERROR` — never a silently
-  wrong row — so it is no worse than any other unexpected error and needs no extra handling here.
-
-- **Same stance as tags otherwise:** no `unique(lower(alias))` / `unique(lower(name))` constraint
-  (collisions are valid human labels; `source_ref` is the stable identity per ADR-025), no
-  merge/dedupe, code-only and reversible, and no shared `resolveExactThenCi(...)` helper — the
-  two Person paths have different fallbacks, so the exact→CI→fallback logic is inlined at each
-  with its load-bearing comment (KISS).
-
 ## Alternatives considered
 
 - **A `unique(lower(name))` index** — rejected: the collisions are valid canonical nodes, and

docs/adr/034-remove-nl-search.md

@@ -1,53 +0,0 @@
-# ADR-034 — Remove NL/smart-search (supersedes ADR-028 ×2, ADR-034-ollama, ADR-035)
-
-**Date:** 2026-06-07
-**Status:** Accepted
-**Issue:** #772
-**Supersedes:** ADR-028 (nl-search-ollama), ADR-028 (ollama-docker-compose-service), ADR-034 (ollama-production-deployment-and-keep-alive), ADR-035 (rule-based-nlp-service)
-
----
-
-## Context
-
-The natural-language search feature ("KI-Suche" / smart search) allowed users to enter
-free-form queries like *"Was hat Walter an Emma im Krieg geschrieben?"* and have them
-interpreted by an LLM into structured filters (persons, tags, date range, keywords).
-
-The feature went through two major iterations:
-1. **Ollama integration** (ADR-028): an `ollama` Docker service running a local LLM
-   (llama3.2/gemma3) parsed queries via a JSON-mode prompt.
-2. **Rule-based NLP service** (ADR-035): after Ollama proved too slow and unreliable on
-   CPU-only hardware, a Python FastAPI microservice (`nlp-service`, port 8001) replaced
-   it with deterministic regex + spaCy parsing plus a lightweight LLM call.
-
-Both approaches shared the same fundamental problem: inference on the production server
-(Hetzner Serverbörse, no GPU, 64 GB RAM, i7-6700) was too slow to be useful, with
-typical query latencies of 10–30 seconds. Users got better and faster results from
-the existing keyword search with date/person/tag filters.
-
-## Decision
-
-**Remove the NL search feature entirely.** The Python `nlp-service` microservice, the
-Spring Boot `search/` package (`NlSearchController`, `NlQueryParserService`,
-`RestClientNlpClient`, `NlSearchRateLimiter`, and all supporting classes), the frontend
-NL search components (`SmartModeToggle`, `SmartSearchStatus`, `InterpretationChipRow`,
-`DisambiguationPicker`), the related Docker Compose services, Prometheus scrape job,
-Grafana dashboard, and all i18n keys are removed.
-
-The existing structured search (FTS keyword + person/tag/date/directional filters) is
-sufficient for the archive's current audience and search workload.
-
-## Consequences
-
-- **Capability removed:** users can no longer enter free-form natural-language queries.
-  They must use the structured filter bar (keyword text box + person/tag/date/directional
-  dropdowns). For documents where these filters are sufficient, there is no regression.
-- **Operational simplification:** the Docker Compose stack loses two services
-  (`nlp-service` and previously `ollama`/`ollama-model-init`). Memory budget on the
-  production host is freed. No external model weights need to be kept warm.
-- **Future reinstatement:** if a GPU-capable host becomes available, re-implementing
-  server-side LLM inference would be straightforward given the clean separation of the
-  `NlSearchController` entry point. However, this ADR deliberately avoids leaving dead
-  infrastructure or stub code in place — start clean if and when that becomes viable.
-- **No data or schema change:** only query/endpoint code and Docker services are removed.
-  The `documents`, `persons`, and `tags` tables and their FTS indexes are untouched.

docs/adr/035-optional-string-three-way-patch-semantics.md

@@ -1,43 +0,0 @@
-# ADR-035 — `Optional<String>` for three-way PATCH semantics
-
-**Status:** Accepted  
-**Date:** 2026-06-08  
-**Issue:** #751 (JourneyItem CRUD API)
-
-## Context
-
-The `PATCH /api/geschichten/{id}/items/{itemId}` endpoint must distinguish three cases for the `note` field:
-
-| JSON body         | Intended meaning      |
-|-------------------|-----------------------|
-| `{"note": "text"}`| Set note to "text"    |
-| `{"note": null}`  | Clear the note        |
-| `{}` (absent)     | Leave note unchanged  |
-
-The standard library for this on Jackson 2.x is `jackson-databind-nullable` (`JsonNullable<T>` from `org.openapitools`). However, that library targets `com.fasterxml.jackson.*` (Jackson 2.x) and is incompatible with Spring Boot 4.0 / Spring Framework 7, which uses `tools.jackson.*` (Jackson 3.x). The module fails to register and throws at startup.
-
-## Decision
-
-Use `Optional<String>` with Java's default field initializer (`= null`) to encode the three states:
-
-```java
-@Data
-public class JourneyItemUpdateDTO {
-    private Optional<String> note = null;  // Java default — absent = no-op
-}
-```
-
-| Java value         | JSON wire         | Semantics     |
-|--------------------|-------------------|---------------|
-| `null` (default)   | field absent      | no-op         |
-| `Optional.empty()` | `{"note": null}`  | clear         |
-| `Optional.of("x")` | `{"note": "x"}`   | set           |
-
-Jackson 3.x natively maps a JSON `null` to `Optional.empty()` and leaves absent fields at their Java default. No custom module is needed.
-
-## Consequences
-
-- No external dependency for PATCH semantics — simpler pom.xml.
-- The DTO field type is `Optional<String>`, not `String` — service code must null-check the field first (`if (noteField == null) return;`) and then call `.orElse(null)` to unwrap.
-- This pattern applies to any future PATCH DTO that needs three-way semantics on a nullable field.
-- `jackson-databind-nullable` is removed from `pom.xml`; `JacksonConfig.java` is kept as a placeholder for future custom modules.

docs/adr/036-geschichte-responses-are-views-not-entities.md

@@ -1,65 +0,0 @@
-# ADR-036 — Geschichte responses are views assembled in-transaction, never entities
-
-**Status:** Accepted
-**Date:** 2026-06-10
-**Issue:** #753 (JourneyEditor frontend), PR #792 review
-
-## Context
-
-The project convention (CLAUDE.md §DTOs) has been: *"Response types are the model
-entities themselves (no response DTOs)."* That convention assumed entities whose
-associations are either eager or initialized by the time Jackson serializes.
-
-The lazy-fetch migration (ADR-022, `open-in-view: false`) broke that assumption:
-Jackson serializes **after** the service transaction has closed, so any lazy
-collection on a returned entity is a dead proxy. `Geschichte.items` (added with the
-Lesereisen data model, #750) made this concrete: every `PATCH /api/geschichten/{id}`
-(save draft, publish) failed with HTTP 500
-`LazyInitializationException: Geschichte.items … (no session)`.
-
-Per-endpoint force-initialization (`g.getItems().size()` inside the transaction)
-worked for `getById()` but is a footgun: every new write method must remember the
-trick, the entity carries a warning comment nobody reads, and the raw entity also
-leaks the `author` `AppUser` graph (email, password hash, groups).
-
-## Decision
-
-In the **geschichte domain**, controllers never return entities. Every response is a
-purpose-built read model assembled **inside** the service transaction:
-
-- `GET /api/geschichten` → `GeschichteSummary` (projection; never carries items;
-  author exposes names only — never email)
-- `GET /api/geschichten/{id}` → `GeschichteView` (with `AuthorView`, `PersonView`,
-  `JourneyItemView` items)
-- `POST /api/geschichten`, `PATCH /api/geschichten/{id}` → `GeschichteView`
-- JourneyItem endpoints → `JourneyItemView`
-
-The invariant: **entities never cross the controller boundary in this domain.**
-A view is constructed while the Hibernate session is open, so serialization can
-never touch a lazy proxy, and the response shape is an explicit, security-reviewed
-contract.
-
-## Alternatives rejected
-
-- **`@Transactional` on read/write methods + force-init (`getItems().size()`)** —
-  fixes one endpoint at a time, silently regresses when the next write method is
-  added, and still serializes the raw `AppUser` author graph.
-- **`open-in-view: true`** — re-opens the session during rendering; hides N+1
-  queries and couples the HTTP layer to Hibernate session lifetime. Rejected
-  already by ADR-022.
-- **Jackson `@JsonIgnore` on lazy fields** — loses the data the client needs
-  (items ARE the journey) instead of loading it deliberately.
-
-## Consequences
-
-- CLAUDE.md §DTOs names the geschichte domain as the exception to the
-  entities-as-responses convention. Other domains (document, person, tag) still
-  return entities; they predate ADR-022's lazy collections on their hot paths and
-  migrate opportunistically when they grow lazy collections of their own.
-- `npm run generate:api` must run after any view change — the generated
-  `Geschichte` schema no longer exists; frontend consumers use
-  `GeschichteView`/`GeschichteSummary`.
-- New geschichte endpoints must add a view (or extend an existing one), not return
-  the entity. The regression guards are `GeschichteHttpTest`
-  (`update_returns_200_and_serializes_items_open_in_view_false`) and
-  `GeschichteListProjectionTest`.

docs/adr/037-journey-items-serve-both-geschichte-subtypes.md

@@ -1,78 +0,0 @@
-# ADR-037 — `journey_items` serves both STORY and JOURNEY Geschichte subtypes
-
-**Status:** Accepted
-**Date:** 2026-06-11
-**Issue:** #795 (restore document management for STORY-type Geschichten), PR #804 review
-
-## Context
-
-V72 added the `journey_items` table as the backing store for Lesereisen (JOURNEY-type
-Geschichten). At the same time, the previous `geschichten_documents` join table was
-dropped (#753) and the restoration of a STORY-level document attachment mechanism was
-deferred to a future issue.
-
-`JourneyItemService.append()` contained an application-level type guard that rejected
-`append()` calls on STORY-type Geschichten with `GESCHICHTE_TYPE_MISMATCH`. This guard
-was the only place where the STORY restriction was encoded — the database schema never
-enforced it (no CHECK constraint, no partial index on `type='JOURNEY'`).
-
-When #795 restored document attachment for STORY-type Geschichten, the type guard was
-the only obstacle. Two implementation paths were considered:
-
-1. Keep an allowlist (`if type not in (JOURNEY, STORY) throw ...`) — dead code today
-   because `GeschichteType` is a two-constant enum; the branch can never be reached and
-   would fail the JaCoCo branch-coverage gate.
-2. Delete the guard entirely — the schema never encoded the restriction; deleting dead
-   application logic rather than replacing it with more dead logic.
-
-Path 2 was chosen.
-
-## Decision
-
-`journey_items` is the document-attachment mechanism for **both** `STORY` and `JOURNEY`
-subtypes. No application-level type guard governs which subtype may hold items. The only
-behavioral difference between the two subtypes' use of items is at the UI layer:
-
-- JOURNEY: items form an ordered reading sequence rendered as a *Lesereise*.
-- STORY: items are a set of attached reference documents rendered as a sidebar panel.
-
-Both subtypes share the same capacity cap (100 items), dedup index, position semantics,
-and DEFERRABLE constraint — enforced at the database layer, not re-implemented per subtype.
-
-The `GESCHICHTE_TYPE_MISMATCH` error code was removed end-to-end (backend enum,
-frontend `ErrorCode` type + `getErrorMessage()` case, all three locale files).
-`GESCHICHTE_TYPE_IMMUTABLE` is unrelated and was left intact.
-
-## Naming asymmetry (intentional)
-
-The error codes `JOURNEY_AT_CAPACITY` and `JOURNEY_DOCUMENT_ALREADY_ADDED` carry
-journey-flavored names. Renaming them would ripple through `ErrorCode.java`, `errors.ts`,
-and three locale files for zero behavior change. `StoryDocumentPanel` remaps these two
-codes to story-worded user messages at the presentation layer — the asymmetry is a
-documented decision, not an accident.
-
-## Alternatives rejected
-
-- **Separate `story_documents` join table for STORY** — creates two nearly-identical
-  schemas for the same concept (document attachment with dedup and ordering), doubles the
-  migration surface, and splits the capacity/dedup logic. Rejected as unnecessary
-  duplication.
-- **Allowlist type guard (`if type not in (JOURNEY, STORY)`)** — unreachable dead code
-  under a two-constant enum; fails the JaCoCo branch gate. Rejected.
-- **Per-subtype application validation** — the schema never encoded the restriction; an
-  application-only rule with no schema backing is the weakest kind of invariant and was
-  removed when the product decision reversed it.
-
-## Consequences
-
-- `JourneyItemService.append()` accepts items for any `Geschichte`, regardless of subtype.
-  The 100-item cap and dedup constraint apply to all.
-- GLOSSARY.md and ARCHITECTURE.md updated to reflect that `JourneyItem` is not
-  JOURNEY-specific.
-- The `l3-backend-3g-supporting.puml` C4 diagram updated: type-guard language removed,
-  `geschQuerySvc` rel label reads "Checks Geschichte existence" (not "and type").
-- `StoryDocumentPanel.svelte` is the STORY-side consumer; `JourneyEditor.svelte` is the
-  JOURNEY-side consumer. Neither is aware of the other.
-- Known pre-existing constraint conflict: `ON DELETE SET NULL` on `journey_items.document_id`
-  combined with `chk_journey_item_not_empty` causes a DB-level 500 when a document linked
-  via a note-less item is deleted. Pre-existing; tracked in follow-up issue.

docs/adr/038-domain-event-driven-journey-item-cleanup.md

@@ -1,118 +0,0 @@
-# ADR-038 — Domain event drives note-less journey-item cleanup on document delete
-
-**Status:** Accepted
-**Date:** 2026-06-11
-**Issue:** #805 (P1 — deleting a document linked via a note-less journey_item 500s at DB constraint)
-
-## Context
-
-Two constraints in V72 encode contradictory rules for a journey item that has a
-`document_id` but no `note`:
-
-- **`fk_journey_items_document` → `ON DELETE SET NULL`** — when a document is deleted,
-  Postgres nulls out `document_id`.
-- **`chk_journey_item_not_empty`** — requires at least one of `document_id` or `note`
-  to be non-null.
-
-A note-less item (`document_id` set, `note IS NULL`) satisfies the CHECK while the
-document exists. Deleting the document causes Postgres to attempt `SET NULL`, which
-would leave both columns null — a direct CHECK violation. Postgres aborts the
-transaction with a 500 that bypasses `GlobalExceptionHandler`.
-
-The natural fix — delete note-less items inside `DocumentService.deleteDocument` before
-`deleteById` runs — cannot call `JourneyItemService` directly: `JourneyItemService`
-already injects `DocumentService`, and Spring Framework 7 (used by Spring Boot 4)
-**fully prohibits constructor-injection cycles**. The application will not start if such
-a cycle is introduced.
-
-## Decision
-
-`DocumentService.deleteDocument` publishes a **`DocumentDeletingEvent`** (plain record,
-payload: `documentId` UUID only) via `ApplicationEventPublisher` **before**
-`documentRepository.deleteById`. A dedicated `@Component`
-`JourneyItemDocumentDeleteListener` in the `geschichte.journeyitem` package consumes
-this event and calls `journeyItemRepository.deleteNoteLessByDocumentId(documentId)`
-directly — bypassing `JourneyItemService` to avoid re-introducing the cycle and to
-suppress the per-item `JOURNEY_ITEM_REMOVED` audit emission (see audit decision below).
-
-### Load-bearing listener-phase choice: plain `@EventListener`
-
-The listener is annotated with `@EventListener` (not
-`@TransactionalEventListener(AFTER_COMMIT)`, not `@Async`). **This choice is
-load-bearing:**
-
-- **`AFTER_COMMIT` would break the fix entirely.** `AFTER_COMMIT` fires *after* the
-  surrounding transaction has committed. By that point, `documentRepository.deleteById`
-  has already executed and Postgres has already tried `ON DELETE SET NULL` — the
-  constraint violation fires before the listener ever runs.
-- **`@Async` would break rollback atomicity (AC-5).** An async listener runs on a
-  separate thread in its own transaction. If `deleteDocument` subsequently rolls back
-  (e.g. due to an unrelated failure), the listener's deletes are in a committed async
-  transaction and cannot be undone.
-- **Plain `@EventListener` runs synchronously in the publisher's thread and
-  transaction.** The listener's JPQL delete and the `deleteById` are a single atomic
-  unit: if either fails, both roll back together.
-
-### Repository method
-
-```java
-@Modifying(clearAutomatically = true)
-@Query("DELETE FROM JourneyItem i WHERE i.document.id = :documentId AND (i.note IS NULL OR i.note = '')")
-int deleteNoteLessByDocumentId(@Param("documentId") UUID documentId);
-```
-
-`i.document.id` (the real association path) is used instead of `i.documentId`: the
-transient `getDocumentId()` getter on `JourneyItem` makes Spring Data unable to resolve
-a derived query path (same trap documented at `JourneyItemRepository:33-44`).
-
-`clearAutomatically = true` invalidates the L1 cache so subsequent reads in the same
-session do not return stale entities.
-
-The predicate `(note IS NULL OR note = '')` covers the `note = ''` edge case that the
-service layer can never produce (normalizeNote converts blank strings to null), but that
-may exist via raw SQL inserts or legacy data. Whitespace-only notes (`note = '   '`)
-do not match and are preserved as note-carrying placeholders.
-
-### Audit decision
-
-The listener calls the repository directly rather than routing through
-`JourneyItemService.delete`. This deliberately bypasses the `JOURNEY_ITEM_REMOVED`
-audit emission: a document used in multiple journeys would otherwise produce N audit
-rows for a single user action. The `DOCUMENT_DELETED` entry written by `deleteDocument`
-is the sole audit record for the operation.
-
-### Boundary: documents must not depend on journey
-
-The event direction is `document → journey`, never the reverse. `DocumentService`
-publishes events it knows nothing about the consumers of; `JourneyItemService`'s
-dependency on `DocumentService` is unchanged and remains the only cross-domain
-reference. This direction is the prerequisite for the cycle constraint to hold.
-
-## Alternatives rejected
-
-- **DB trigger on `journey_items`** — trigger logic is opaque to Java developers,
-  invisible to code review, and not covered by the JPA test harness.
-- **RESTRICT instead of SET NULL** — breaks the existing note-carrying placeholder
-  UX: deleting a document with a note-carrying journey item would 409 instead of
-  preserving the item as a placeholder.
-- **Relax `chk_journey_item_not_empty`** — the constraint enforces a real invariant
-  (every item must have at least document or note). Removing it would allow empty rows.
-- **`@Lazy` on the `JourneyItemService → DocumentService` injection** — Spring Boot 4 /
-  Spring Framework 7 prohibits constructor-injection cycles regardless of `@Lazy`.
-- **Make `DocumentService` call `JourneyItemService`** — introduces the prohibited
-  cycle. Rejected at design time.
-
-## Consequences
-
-- **No schema change** — no new Flyway migration, no `db-orm.puml` /
-  `db-relationships.puml` update.
-- This is the **first custom domain event** in the codebase. No prior
-  `ApplicationEventPublisher` usage existed in `main/`. New cross-domain cleanup that
-  cannot use direct service calls should follow this pattern.
-- All tests that delete documents and then assert journey-item state **must route
-  through `DocumentService.deleteDocument`**, not `documentRepository.deleteById`.
-  The existing `JourneyItemIntegrationTest` tests that covered the note-carrying
-  placeholder UX have been updated accordingly.
-- The `DOCUMENT_DELETED` `AuditKind` was added as part of this fix to give AC-7's
-  audit assertion a positive check (absence-only assertions pass vacuously if all
-  auditing regresses).

docs/adr/039-person-life-dates-localdate-precision.md

@@ -1,98 +0,0 @@
-# ADR-039 — Person life dates become LocalDate + DatePrecision
-
-**Status:** Accepted
-**Date:** 2026-06-12
-**Issue:** #773 (Zeitstrahl milestone, foundational)
-
-## Context
-
-`Person` stored `birthYear`/`deathYear` as `Integer`. A known exact birthday
-(`1901-03-14`) had nowhere to live, and every display was stuck at year precision.
-The Zeitstrahl's derived life-events need real dates with precision metadata, and the
-document domain already solved exactly this problem with
-`Document.documentDate` + `metaDatePrecision`.
-
-V76 replaces the two integer columns with `birth_date`/`death_date` (`DATE`, nullable)
-plus `birth_date_precision`/`death_date_precision` (`VARCHAR(16) NOT NULL DEFAULT
-'UNKNOWN'`), backfilling existing years as `YYYY-01-01` at `YEAR` precision.
-
-## Decisions
-
-### 1. `DatePrecision` stays in `document/` and is imported cross-domain
-
-The `person` package imports `org.raddatz.familienarchiv.document.DatePrecision`
-directly. The layering rule (controllers → services → own repository) governs
-service-to-repository coupling, **not** value-type sharing — an enum has no behaviour
-and no persistence side effects. Creating a `common/` package for one enum would be
-premature structure; if a third domain needs it, revisit then. The enum remains a
-verbatim mirror of the import normalizer's `Precision` values (ADR-025) — changes must
-stay in sync with `tools/import-normalizer/dates.py`.
-
-### 2. Precision columns are NOT NULL with default `UNKNOWN`
-
-Mirrors `Document.metaDatePrecision`. The illegal state "date present, precision null"
-cannot exist: the named CHECK constraints
-(`chk_person_birth_date_precision_coherence`, `…_values`,
-`chk_person_birth_before_death`, and the death-side twins) enforce
-`(date IS NULL) = (precision = 'UNKNOWN')` and the temporal order at the DB level;
-`PersonService.validateLifeDates` enforces the same rules first so users get a
-structured 400 (`INVALID_DATE_PRECISION` / `BIRTH_AFTER_DEATH`) instead of a
-constraint-violation 500.
-
-Storage accepts all seven `DatePrecision` values (enum-to-string mapping consistency),
-but the person new/edit form offers only **DAY / MONTH / YEAR** — `RANGE` and `SEASON`
-are semantically nonsensical for a birth or death, and `APPROX` is excluded from the
-form to reduce cognitive load for the senior author audience. Legacy `APPROX` rows
-still render correctly (display delegates to `formatDocumentDate`).
-
-The edit form seeds a stored non-offered precision (`APPROX`/`SEASON`/`RANGE`) into
-the select as `YEAR`, so an untouched save coerces it to `YEAR` ("ca. 1944" becomes
-"1944"). Accepted: nothing currently writes those precisions to persons (the form
-offers DAY/MONTH/YEAR, the importer writes YEAR/UNKNOWN, V76 backfills YEAR), so the
-case is only reachable via direct API writes — and seeding `YEAR` is strictly safer
-than the alternative of silently claiming `DAY` precision.
-
-### 3. Derived-year pattern for backward-compatible DTOs
-
-`PersonNodeDTO` (Stammbaum) and `RelationshipDTO` keep `Integer birthYear/deathYear`,
-derived null-safely in the relationship services (`birthDate != null ?
-birthDate.getYear() : null` — never 0, never empty string; REQ-PERSON-DATE-01). The
-native queries behind `PersonSummaryDTO` project
-`CAST(EXTRACT(YEAR FROM p.birth_date) AS int) AS birthYear`.
-
-### 4. `PersonSummaryDTO` intentionally exposes years only
-
-The person list/search views show year precision only; full precision lives on the
-person detail page. Do **not** add `LocalDate getBirthDate()` to the interface without
-updating all four native queries (`findAllWithDocumentCount`,
-`searchWithDocumentCount`, `findTopByDocumentCount`, `findByFilter`) — the interface
-projection is satisfied purely by the SQL SELECT aliases.
-
-### 5. `preferHumanDate` extends ADR-025's human-edit-preserve rule
-
-The importer stays year-shaped: `PersonUpsertCommand` keeps `Integer birthYear/
-deathYear` because the spreadsheet only knows a year — pushing `LocalDate` into the
-importer would fabricate precision. On upsert, `PersonService.preferHumanDate` returns
-a `DatePrecisionPair` record (date and precision travel as one value so they cannot go
-out of sync):
-
-- existing precision DAY/MONTH/SEASON/RANGE/APPROX → hand-entered, preserved verbatim;
-- existing precision YEAR/UNKNOWN → refreshed from the canonical year as
-  `YYYY-01-01` + `YEAR` (or cleared to null/`UNKNOWN` when the sheet has no year).
-
-The original integer/string `preferHuman` overloads remain for non-date fields.
-
-### 6. Known limitation — mixed-precision comparison
-
-`validateLifeDates` compares stored `LocalDate` values. A DAY-precision birth late in
-the same year as a YEAR-precision death (stored as Jan 1st) is rejected with
-`BIRTH_AFTER_DEATH`. This is intentional; the `error_birth_after_death` i18n message
-carries the workaround hint (enter the following year as the death year).
-
-## Consequences
-
-- V76 is one-way (columns dropped). Rollback = targeted `pg_restore -t persons` from
-  the pre-deploy dump — see `docs/DEPLOYMENT.md` §5.
-- Exact dates now render on person cards, hover cards, and the mention dropdown; the
-  Stammbaum and person list are visually unchanged.
-- The Zeitstrahl can derive birth/death life-events at full precision.

docs/adr/040-timeline-domain-data-model.md

@@ -1,115 +0,0 @@
-# ADR-040 — Timeline domain data model
-
-**Status:** Accepted
-**Date:** 2026-06-12
-**Issue:** #774 (Zeitstrahl milestone, foundational)
-
-## Context
-
-The Zeitstrahl (family timeline) needs a home for *curated* events — births,
-weddings, moves, and world-historical context a curator types in by hand, distinct
-from the OCR-derived `Document` letters. This ADR commits the new `timeline` domain's
-data model: the `TimelineEvent` entity, the `EventType` enum, a repository, and the
-V77 migration. No service, controller, or DTO ships here — those land in later issues.
-
-A `TimelineEvent` carries the same date block as `Document` (`eventDate` +
-`precision` + `eventDateEnd`) so events and letters render through one path, but its
-audit footprint deliberately diverges (see below).
-
-## Decisions
-
-### 1. New `timeline` domain package, separate from `geschichte`
-
-Curated timeline events are their own concern, not a Lesereise/`Geschichte` subtype.
-The domain owns `TimelineEvent`, `EventType`, and `TimelineEventRepository`.
-
-### 2. Responses (#775) will be views, not serialized entities
-
-`TimelineEvent` has two LAZY `ManyToMany` collections (`persons`, `documents`) and
-`open-in-view` is `false` — exactly the shape that motivated ADR-036 for `geschichte`.
-#775 must assemble `TimelineEventView`/`TimelineEventSummary` inside the service
-transaction; a serialized entity is a 500 waiting to happen. Decided up front so it is
-not retrofitted later.
-
-### 3. `precision` reuses `document.DatePrecision` — imported, not duplicated
-
-The `timeline` package imports `org.raddatz.familienarchiv.document.DatePrecision`
-directly, the same cross-domain value-type sharing ADR-039 established for `person`.
-An enum has no behaviour and no persistence side effects, so the layering rule
-(services → own repository) does not govern it. The enum stays a verbatim mirror of the
-import normalizer's `Precision` values (ADR-025); changes must stay in sync with
-`tools/import-normalizer/dates.py`. Moving `DatePrecision` into a shared package is a
-wider refactor (touching `Document`, `importing`, `person`) and its own future ADR.
-
-### 4. `precision = UNKNOWN` is forbidden; every other value is legal
-
-`eventDate` is NOT NULL — a curated event always has at least a year, so only OCR letters
-fall into the "Ohne Datum" bucket. The CHECK `chk_timeline_event_precision`
-(`date_precision <> 'UNKNOWN'`) forbids exactly that one value. `SEASON` ("Sommer 1914")
-and `APPROX` ("ca. 1914") are explicitly legal — family memory is full of both, and the
-spec's rendering table covers them. Do not narrow the CHECK to an allow-list; an
-over-tight constraint would force curators to fake `YEAR` and render dishonest dates.
-
-### 5. RANGE invariant is a strict biconditional at the DB, intentionally tighter than `Document`
-
-`chk_timeline_event_range` enforces `(date_precision = 'RANGE') = (event_date_end IS NOT
-NULL)` — `eventDateEnd` is non-null **iff** precision is `RANGE`, both directions. This is
-*stricter* than `Document`'s open-ended ranges (which allow a null end on a RANGE) because a
-curated event always has a known, closed end when it spans a range — it is authored, not
-inferred. This divergence is deliberate: a future "bug fix" must not relax it to match
-`Document`.
-
-### 6. Audit trail: `@Version` + NOT NULL `createdBy`/`updatedBy`, diverging from `Document`
-
-`Document` has neither a version nor a creator. A curated entity edited by multiple curators
-warrants real protection, so `TimelineEvent` adds:
-
-- `@Version Long version` — optimistic locking for the multi-curator edit flow (#775).
-  Object `Long` (not primitive) so it is `null` before first persist; Hibernate sets `0` on
-  insert. The service **must** catch `ObjectOptimisticLockingFailureException` and translate
-  it to `DomainException.conflict(...)`. Without that translation a concurrent-write conflict
-  surfaces as HTTP 500 with Hibernate internals in the body — information disclosure (CWE-209).
-- `createdBy`/`updatedBy` as bare `UUID`, `NOT NULL`, no FK to `app_users` (sidecar pattern,
-  matching `DocumentAnnotation`/`OcrJob`; keeps `timeline` decoupled from `user`, avoids
-  lazy-load surprises in the read-heavy assembly path). NOT NULL makes a curated event with no
-  author impossible — an audit gap closed at the schema level. `DocumentAnnotation.createdBy`
-  is nullable and has no `updatedBy`; the escalation here is deliberate because curated events
-  are multi-author. Curator display names resolve through `UserService` at render time.
-
-`updatedBy` is **not** advanced by `@UpdateTimestamp` — the service must set it from the
-session principal before every `save()`, or the timestamp moves while the "who" goes stale.
-
-### 7. `createdBy`/`updatedBy` are server-populated only — never bound from client input
-
-Both are set from the session principal in the service, never from a request body. Binding
-them from client input is an authorship-forgery / mass-assignment vector (CWE-639). #775's
-regression suite must include forgery cases on **both** write paths (`POST` body with
-`createdBy`, `PUT` body with `updatedBy`) — create and update are separate binding paths, so
-testing only one leaves half the vector open. The update test must assert `updatedBy` equals
-the *second* editor's UUID, not merely non-null.
-
-### 8. `EventType` string values are a stable frontend styling contract
-
-The Tailwind class map in the timeline Svelte components hard-codes `PERSONAL` (family accent)
-and `HISTORICAL` (muted world accent) as strings. There is no mapping layer — renaming either
-value requires a coordinated frontend change. Recorded here to prevent a silent regression.
-
-### 9. Explicit `@JoinTable` on both ManyToMany fields
-
-Without explicit `@JoinTable(name, joinColumns, inverseJoinColumns)`, Hibernate's naming
-strategy could diverge from the V77 DDL's explicit table/column names. Explicit mapping
-guarantees alignment and makes future column renames a deliberate, visible change. All four FK
-columns are `ON DELETE CASCADE`: deleting a Person or Document drops the join row and leaves
-the event intact (V71/ADR-032 hardening — a person delete must never 500).
-
-## Consequences
-
-- V77 is forward-only; rollback is manual DDL (`DROP TABLE` the two join tables, then
-  `timeline_events`). No rollback script, no rollback test.
-- The `timeline → document.DatePrecision` compile coupling is permanent until a shared-package
-  refactor; precedent already exists (`importing/DocumentImporter`, `person`).
-- The service/controller/DTO layer (#775) inherits the view-assembly, optimistic-lock
-  translation, forgery-guard, and permission obligations recorded above. It must also add a
-  service-level title-length check (new `ErrorCode`, e.g. `TIMELINE_TITLE_TOO_LONG`, mirroring
-  `GESCHICHTE_TITLE_TOO_LONG`) — `title` is `VARCHAR(255)`, and without the guard an over-long
-  title surfaces as a raw `DataIntegrityViolationException` → HTTP 500.

docs/architecture/c4/l1-context.puml

@@ -9,12 +9,10 @@ Person(member, "Family Member", "Access by administrator invite. Searches, brows
 System(familienarchiv, "Familienarchiv", "Web application for digitising, organising, and searching family documents")
 System_Ext(mail, "Email Service", "SMTP server. Delivers notification emails (mentions, replies) and password-reset links.")
 System_Ext(glitchtip, "GlitchTip", "Self-hosted error tracking (Sentry-compatible). Receives frontend and backend error events with stack traces.")
-System_Ext(ollama, "Ollama (self-hosted)", "Local LLM inference server (qwen2.5:7b). Parses natural-language search queries into structured filters. Runs in the same Docker Compose stack.")
 
 Rel(admin, familienarchiv, "Manages via browser", "HTTPS")
 Rel(member, familienarchiv, "Searches, reads, and transcribes via browser", "HTTPS")
 Rel(familienarchiv, mail, "Sends notification and password-reset emails (optional)", "SMTP")
 Rel(familienarchiv, glitchtip, "Sends error events with errorId and stack trace", "HTTPS")
-Rel(familienarchiv, ollama, "NL query parsing for natural-language search", "HTTP / REST (internal)")
 
 @enduml

docs/architecture/c4/l2-containers.puml

@@ -12,13 +12,15 @@ System_Boundary(archiv, "Familienarchiv (Docker Compose)") {
     Container(frontend, "Web Frontend", "SvelteKit / Node adapter / port 3000", "Server-side rendered UI. Handles auth session cookies, document search and viewer, transcription editor, annotation layer, family tree (Stammbaum), stories (Geschichten), activity feed (Chronik), enrichment workflow, and admin panel.")
     Container(backend, "API Backend", "Spring Boot 4 / Java 21 / Jetty / port 8080", "REST API. Implements document management, search, user auth, file upload/download, transcription, OCR orchestration, and SSE notifications. Trusts X-Forwarded-* headers from Caddy.")
     Container(ocr, "OCR Service", "Python FastAPI / port 8000", "Handwritten text recognition (HTR) and OCR microservice. Single-node by design — see ADR-001. Reachable only on the internal Docker network; no external port exposed.")
+    Container(ollama, "Ollama LLM Service", "ollama/ollama:0.30.6 / port 11434 (internal only)", "Local LLM inference server for NL search. Runs qwen2.5:7b-instruct-q4_K_M on CPU. Reachable only on the internal Docker network; no external port exposed. Disabled when APP_OLLAMA_BASE_URL is unset or blank.")
+    ' Named volume: ollama_models — model weights, fully reproducible, no backup needed
     ContainerDb(db, "Relational Database", "PostgreSQL 16", "Stores document metadata, persons, users, permission groups, tags, transcription blocks, audit log, and Spring Session data.")
     ContainerDb(storage, "Object Storage", "MinIO (S3-compatible)", "Stores the actual document files (PDFs, scans). Backend uses a bucket-scoped service account (archiv-app), not MinIO root.")
     Container(mc, "Bucket / Service-Account Init", "MinIO Client (mc)", "One-shot container on startup. Idempotent: creates the archive bucket, the archiv-app service account, and attaches the readwrite policy.")
 }
 
 System_Boundary(observability, "Observability Stack (/opt/familienarchiv/docker-compose.observability.yml)") {
-    Container(prometheus, "Prometheus", "prom/prometheus:v3.4.0", "Scrapes metrics from backend (8081 /actuator/prometheus), OCR service (8000 /metrics), node-exporter, and cAdvisor. Retention: 30 days.")
+    Container(prometheus, "Prometheus", "prom/prometheus:v3.4.0", "Scrapes metrics from backend (8081 /actuator/prometheus), OCR service (8000 /metrics), Ollama (11434 /metrics), node-exporter, and cAdvisor. Retention: 30 days.")
     Container(node_exporter, "Node Exporter", "prom/node-exporter:v1.9.0", "Host-level CPU, memory, disk, and network metrics.")
     Container(cadvisor, "cAdvisor", "gcr.io/cadvisor/cadvisor:v0.52.1", "Per-container resource metrics.")
     Container(loki, "Loki", "grafana/loki:3.4.2", "Stores log streams from all containers.")
@@ -45,7 +47,8 @@ Rel(promtail, loki, "Pushes log streams", "HTTP/Loki push API")
 Rel(backend, tempo, "Sends distributed traces via OTLP", "HTTP / OTLP / port 4318 (archiv-net)")
 Rel(prometheus, backend, "Scrapes JVM + HTTP metrics", "HTTP 8081 /actuator/prometheus")
 Rel(prometheus, ocr, "Scrapes OCR + http_* metrics", "HTTP 8000 /metrics")
-
+Rel(backend, ollama, "NL search inference requests", "HTTP / REST / JSON")
+Rel(prometheus, ollama, "Scrapes LLM request metrics", "HTTP 11434 /metrics")
 Rel(grafana, prometheus, "Queries metrics", "HTTP 9090")
 Rel(grafana, loki, "Queries logs", "HTTP 3100")
 Rel(grafana, tempo, "Queries traces", "HTTP 3200")

docs/architecture/c4/l3-backend-3g-supporting.puml

@@ -16,11 +16,8 @@ System_Boundary(backend, "API Backend (Spring Boot)") {
     Component(notifCtrl, "NotificationController", "Spring MVC — /api/notifications", "REST and SSE endpoints for notification stream, history with filtering, read/unread state, and per-user preference management.")
     Component(notifSvc, "NotificationService", "Spring Service", "Creates REPLY and MENTION notifications, optionally sends email, marks as read, and pushes events to connected clients via SseEmitterRegistry.")
     Component(sseRegistry, "SseEmitterRegistry", "Spring Component", "In-memory ConcurrentHashMap of Spring SseEmitter instances per user. Handles registration, deregistration, and JSON event broadcasts.")
-    Component(geschCtrl, "GeschichteController", "Spring MVC — /api/geschichten", "CRUD for publishable stories (STORY) and reading journeys (JOURNEY). Returns GeschichteSummary projections for list; full Geschichte with JourneyItems for detail. Requires BLOG_WRITE permission for write operations.")
-    Component(geschSvc, "GeschichteService", "Spring Service", "Manages story lifecycle (DRAFT → PUBLISHED with timestamp). Supports two subtypes: STORY (prose) and JOURNEY (ordered JourneyItem sequence). Sanitizes HTML body with an allowlist policy.")
-    Component(geschQuerySvc, "GeschichteQueryService", "Spring Service", "Read-only facade over GeschichteRepository. Exposes existsById() and findById() to prevent JourneyItemService from crossing domain boundaries.")
-    Component(journeyItemSvc, "JourneyItemService", "Spring Service", "Manages journey item lifecycle: append (100-item cap), updateNote (three-way PATCH), delete, and reorder (DEFERRABLE position swap). Serves both STORY and JOURNEY subtypes.")
-    Component(journeyListener, "JourneyItemDocumentDeleteListener", "Spring @EventListener", "Consumes DocumentDeletingEvent synchronously inside the delete transaction and removes note-less journey items before ON DELETE SET NULL fires, preventing a chk_journey_item_not_empty violation. See ADR-038.")
+    Component(geschCtrl, "GeschichteController", "Spring MVC — /api/geschichten", "CRUD for publishable stories that link persons and documents. Requires BLOG_WRITE permission for write operations.")
+    Component(geschSvc, "GeschichteService", "Spring Service", "Manages story lifecycle (DRAFT → PUBLISHED with timestamp). Sanitizes HTML body with an allowlist policy.")
     Component(exHandler, "GlobalExceptionHandler", "Spring @RestControllerAdvice", "Converts DomainException, validation errors, and generic exceptions to ErrorResponse JSON with machine-readable ErrorCode and HTTP status.")
 }
 
@@ -41,12 +38,6 @@ Rel(notifCtrl, notifSvc, "Delegates to")
 Rel(notifCtrl, sseRegistry, "Registers client SSE connection")
 Rel(notifSvc, sseRegistry, "Broadcasts events to connected clients")
 Rel(geschCtrl, geschSvc, "Delegates to")
-Rel(geschCtrl, journeyItemSvc, "Delegates journey item CRUD")
-Rel(journeyItemSvc, geschQuerySvc, "Checks Geschichte existence")
-Rel(geschQuerySvc, db, "Reads geschichten", "JDBC")
-Rel(journeyItemSvc, db, "Reads / writes journey_items", "JDBC")
-Rel(documentSvc, journeyListener, "DocumentDeletingEvent", "in-process event")
-Rel(journeyListener, db, "Deletes note-less journey_items", "JDBC")
 Rel(auditSvc, db, "Writes audit_log", "JDBC")
 Rel(auditQuery, db, "Reads audit_log", "JDBC")
 Rel(notifSvc, db, "Reads / writes notifications", "JDBC")

docs/architecture/c4/l3-backend-timeline.puml

@@ -1,24 +0,0 @@
-@startuml
-!include <C4/C4_Component>
-
-title Component Diagram: API Backend — Timeline (Zeitstrahl)
-
-ContainerDb(db, "PostgreSQL", "PostgreSQL 16")
-
-System_Boundary(backend, "API Backend (Spring Boot)") {
-    Component(timelineRepo, "TimelineEventRepository", "Spring Data JPA", "Reads and writes TimelineEvent rows and their persons/documents join tables (timeline_event_persons, timeline_event_documents). Issue #774 ships the repository empty; the per-person filter query lands in #777.")
-
-    Component(timelineSvc, "TimelineEventService", "Spring Service (planned, #775)", "Will own curated-event CRUD: assemble TimelineEventView/Summary inside the transaction (lazy ManyToMany + open-in-view=false, per ADR-036/ADR-040), populate createdBy/updatedBy from the session principal, and translate optimistic-lock conflicts to DomainException.conflict.")
-    Component(timelineCtrl, "TimelineEventController", "Spring MVC (planned, #775)", "Will expose /api/timeline reads (READ_ALL) and writes (WRITE_ALL). createdBy/updatedBy are never bound from request bodies (CWE-639).")
-}
-
-System_Ext(documentDomain, "Document domain", "Provides DatePrecision (shared value type) and Document references for linked letters")
-System_Ext(personDomain, "Person domain", "Provides Person references for who an event involves")
-
-Rel(timelineRepo, db, "SQL queries", "JDBC")
-Rel(timelineSvc, timelineRepo, "Reads / writes events (planned)")
-Rel(timelineCtrl, timelineSvc, "Delegates to (planned)")
-Rel(timelineRepo, personDomain, "References persons via join table")
-Rel(timelineRepo, documentDomain, "References documents via join table")
-
-@enduml

docs/architecture/c4/l3-frontend-3b-document-workflows.puml

@@ -10,11 +10,6 @@ System_Boundary(frontend, "Web Frontend (SvelteKit / SSR)") {
     Component(homePage, "/ (Home / Search)", "SvelteKit Route", "Loader: parses URL params (q, from, to, senderId, receiverId, tags), fetches /api/documents/search and /api/persons. Renders search form with full-text, date range, sender/receiver typeahead, and tag filters.")
     Component(docsListPageTs, "/documents/+page.ts", "SvelteKit Client Loader", "Client-side load gated by matchMedia('(min-width: 1024px)') and ?view query. Fetches /api/documents/density only on desktop (Tailwind lg breakpoint) and outside calendar view; degrades to empty buckets on network failure.")
     Component(timelineFilter, "TimelineDensityFilter.svelte", "Svelte Component", "Per-month density bars above the document list. Click selects a single month, emits onchange({from, to}) using YYYY-MM-DD boundaries. Hidden on mobile and tablet (below lg, 1024px) and in calendar view.")
-    Component(searchFilterBar, "SearchFilterBar.svelte", "Svelte Component", "Search/filter card on /documents. Hosts the keyword input, sort, advanced filters, and the smart-mode toggle. In smart mode submits the NL query on Enter via onSmartSearch instead of the live keyword search.")
-    Component(smartToggle, "search/SmartModeToggle.svelte", "Svelte Component", "Toggle pill (KI/Text) inside the search input. aria-pressed; switches between keyword and NL (smart) search modes.")
-    Component(chipRow, "search/InterpretationChipRow.svelte", "Svelte Component", "Renders NL interpretation chips (Absender / directional / Zeitraum / Stichwort). Removing a chip emits onRemoveChip; the page re-runs a keyword GET with the remaining params.")
-    Component(smartStatus, "search/SmartSearchStatus.svelte", "Svelte Component", "Full-area panels for NL search: loading (role=status), 503 SMART_SEARCH_UNAVAILABLE (with keyword fallback), 429 SMART_SEARCH_RATE_LIMITED.")
-    Component(disambig, "search/DisambiguationPicker.svelte", "Svelte Component", "Accessible single-select disclosure for ambiguous person names; selecting a candidate re-runs the search via GET.")
     Component(docDetail, "/documents/[id]", "SvelteKit Route", "Loader: GET /api/documents/{id}. Page: metadata panel, inline file viewer, transcription editor, annotation layer, and comment thread.")
     Component(docEdit, "/documents/[id]/edit", "SvelteKit Route", "Edit form with PersonTypeahead, TagInput, date/location fields. Form action: PUT /api/documents/{id}.")
     Component(docNew, "/documents/new", "SvelteKit Route", "Upload form for a new document. Loader: GET /api/persons. Form action: POST /api/documents with multipart file.")
@@ -30,12 +25,6 @@ Rel(user, homePage, "Searches and browses", "HTTPS / Browser")
 Rel(homePage, backend, "GET /api/documents/search, GET /api/persons", "HTTP / JSON")
 Rel(docsListPageTs, backend, "GET /api/documents/density (desktop only, ≥1024px)", "HTTP / JSON")
 Rel(homePage, timelineFilter, "Mounts above the result list")
-Rel(homePage, searchFilterBar, "Mounts the search/filter card")
-Rel(searchFilterBar, smartToggle, "Embeds the smart-mode toggle in the input")
-Rel(homePage, backend, "POST /api/search/nl (smart mode)", "HTTP / JSON")
-Rel(homePage, smartStatus, "Renders loading / 503 / 429 panels")
-Rel(homePage, chipRow, "Renders interpretation chips; handles chip removal")
-Rel(homePage, disambig, "Renders the picker when names are ambiguous")
 Rel(docsListPageTs, timelineFilter, "Provides density / minDate / maxDate props")
 Rel(docDetail, backend, "GET /api/documents/{id}, GET /api/documents/{id}/file", "HTTP / JSON + Binary")
 Rel(docEdit, backend, "PUT /api/documents/{id}", "HTTP / Multipart")

docs/architecture/c4/l3-frontend-3c-people-stories.puml

@@ -11,8 +11,8 @@ System_Boundary(frontend, "Web Frontend (SvelteKit / SSR)") {
     Component(personEdit, "/persons/[id]/edit and /persons/new", "SvelteKit Routes", "Create and edit person forms. Edit: metadata, aliases, explicit relationships. Actions: PUT/POST /api/persons.")
     Component(personReview, "/persons/review", "SvelteKit Route", "Transcriber triage view (WRITE-gated link). Lists provisional persons; per-row Merge / Umbenennen / Bestätigen / Löschen. Actions: POST /merge, PUT /{id}, PATCH /{id}/confirm, DELETE /{id}.")
     Component(aktivitaeten, "/aktivitaeten", "SvelteKit Route", "Unified activity feed (Chronik). Loader: GET /api/dashboard/activity and GET /api/notifications?read=false.")
-    Component(geschichten, "/geschichten and /geschichten/[id]", "SvelteKit Routes", "Story/Journey list and detail pages. List: GeschichteListRow with REISE badge for JOURNEY type. Detail: dispatches to StoryReader (rich text + persons) or JourneyReader (intro + ordered JourneyItemCard/JourneyInterlude items + empty state) based on GeschichteType. BLOG_WRITE users see edit/delete actions. Loader: GET /api/geschichten, GET /api/geschichten/{id}.")
-    Component(geschichtenEdit, "/geschichten/[id]/edit and /geschichten/new", "SvelteKit Routes", "Story editor and creation flow. New: TypeSelector (STORY/JOURNEY radio group with roving tabindex) → StoryCreate (TipTap rich text, person linking, POST /api/geschichten) or JourneyCreate (title + first item). Edit: branches on GeschichteType — STORY opens GeschichteEditor (TipTap body + GeschichteSidebar incl. StoryDocumentPanel: document linking via POST/DELETE /items); JOURNEY opens JourneyEditor (title, intro textarea, ordered JourneyItemRow list with drag-reorder + move-up/down, JourneyAddBar for document/interlude addition, GeschichteSidebar). JourneyEditor mutations: POST/DELETE /items, PUT /items/reorder, PATCH /items/{id}. Requires BLOG_WRITE permission.")
+    Component(geschichten, "/geschichten and /geschichten/[id]", "SvelteKit Routes", "Story list and detail pages. Loader: GET /api/geschichten?status=PUBLISHED.")
+    Component(geschichtenEdit, "/geschichten/[id]/edit and /geschichten/new", "SvelteKit Routes", "Story editor with rich text, person and document linking. Actions: PUT/POST /api/geschichten. Requires BLOG_WRITE permission.")
     Component(stammbaum, "/stammbaum", "SvelteKit Route", "Family tree visualisation. Loader: GET /api/network (nodes + edges). Renders interactive family tree from network graph data.")
     Component(themen, "/themen", "SvelteKit Route", "Browsable topic index. Shows all root tags as cards with color bars and child rows. ThemenWidget also embedded in the home dashboard (reader + editor sidebar). Loader: GET /api/tags/tree.")
     Component(profilePage, "/profile", "SvelteKit Route", "Current user profile settings. Loader: GET /api/users/me/notification-preferences. Actions: update name/password and notification preferences.")
@@ -24,8 +24,8 @@ Rel(personsPage, backend, "GET /api/persons (filter + page params -> PersonSearc
 Rel(personEdit, backend, "GET /api/persons/{id}, PUT /api/persons/{id}, POST /api/persons", "HTTP / JSON")
 Rel(personReview, backend, "GET /api/persons?provisional=true, PATCH /api/persons/{id}/confirm, DELETE /api/persons/{id}, POST /api/persons/{id}/merge", "HTTP / JSON")
 Rel(aktivitaeten, backend, "GET /api/dashboard/activity, GET /api/notifications", "HTTP / JSON")
-Rel(geschichten, backend, "GET /api/geschichten, GET /api/geschichten/{id}, DELETE /api/geschichten/{id}", "HTTP / JSON")
-Rel(geschichtenEdit, backend, "GET /api/persons/{id} (pre-populate), POST /api/geschichten, PUT /api/geschichten/{id}, POST/DELETE /api/geschichten/{id}/items, PUT /api/geschichten/{id}/items/reorder, PATCH /api/geschichten/{id}/items/{itemId}", "HTTP / JSON")
+Rel(geschichten, backend, "GET /api/geschichten", "HTTP / JSON")
+Rel(geschichtenEdit, backend, "GET/PUT/POST /api/geschichten", "HTTP / JSON")
 Rel(stammbaum, backend, "GET /api/network", "HTTP / JSON")
 Rel(themen, backend, "GET /api/tags/tree", "HTTP / JSON")
 Rel(profilePage, backend, "GET/PUT /api/users/me, notification-preferences", "HTTP / JSON")