Some checks failed
CI / Unit & Component Tests (push) Successful in 7m35s
CI / OCR Service Tests (push) Successful in 36s
CI / Backend Unit Tests (push) Failing after 12m42s
CI / fail2ban Regex (push) Successful in 1m50s
CI / Semgrep Security Scan (push) Successful in 37s
CI / Compose Bucket Idempotency (push) Successful in 1m18s
Closes #850 ## Summary On `/zeitstrahl`, a curated event that has letters linked to it now renders as a contained event card — the event is the card header (accent glyph, title, `{date} · {kuratiert|abgeleitet}` subtitle, count, and a curator edit link), with its linked letters listed inside (first 5, then a keyboard-operable show-more/less toggle). Letters in a year *other* than the event's band get a lighter cross-year `✉ title` card. Every other letter stays a plain, alternating, density-folding chronological letter. There is **no grouping control** — clustering is automatic and always on. The meta-line drops its `Gruppierung: Datum` segment. This supersedes #827: it keeps that branch's event-card clustering and the computed `linkedEventId`, and drops the toggle, the Thema mode, and the "Weitere Briefe" drawer. ## What changed **Backend** - `TimelineEntryDTO` gains a nullable `linkedEventId` (UUID; not `@Schema(REQUIRED)`). - `TimelineService.resolveLetterEventLinks` resolves each letter's curated event in one batched pass over the events it already loads — no per-letter query, no new column, no Flyway migration. - Regenerated the single `linkedEventId?` field in `api.ts`. **Frontend** - New `eventClustering.ts` (`buildEventLookup`, `splitYearLetters`, `CLUSTER_PREVIEW=5`) — filter-then-cluster: a letter clusters only if its `linkedEventId` is set AND present in the lookup, otherwise it stays loose. - New `EventCluster.svelte` — the contained event card (same-year event header + edit link, or cross-year ✉ text header; first-5 + show-more). - `LetterCard.svelte` gains `compact` + `variant='event'` (the `.lcard.ev` in-card letter). - `YearBand.svelte` rebuilt to render event clusters inline; loose letters keep the alternating layout and density strip, and the strip counts **only** loose letters (no duplication). - `TimelineView.svelte` builds the event lookup once and threads it + `canWrite` to each band. - `+page.svelte` drops the grouping meta segment; the unused `timeline_grouping_date` key removed from de/en/es. - New `timeline_bucket_show_more`/`_less` keys in all locales. - REQ-010 `{@html}` grep gate over `lib/timeline/`. ## Tests (real runs) - Backend `TimelineServiceTest`: **30 passed** (incl. the 2 new `linkedEventId` tests); `DerivedEventsAssemblyTest`: 17 passed; backend main sources compile. - Frontend client sweep (`LetterCard`, `EventCluster`, `YearBand`, `TimelineView`, `zeitstrahl/page`): **81 passed** (5 files). - Frontend server sweep (`eventClustering`, `messages`, `timeline-no-raw-html`): **18 passed** (3 files). - `svelte-check`: no new errors in the touched files (pre-existing baseline noise elsewhere unchanged). RTM: thirteen `REQ-001..013` rows added for #850 (feature `inline-event-clustering`), Status Done. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Marcel <marcel@familienarchiv> Reviewed-on: #851
142 lines
5.0 KiB
TypeScript
142 lines
5.0 KiB
TypeScript
import { describe, it, expect } from 'vitest';
|
|
import { buildEventLookup, splitYearLetters, CLUSTER_PREVIEW } from './eventClustering';
|
|
import { makeEntry } from './test-factories';
|
|
import type { components } from '$lib/generated/api';
|
|
|
|
type TimelineDTO = components['schemas']['TimelineDTO'];
|
|
type TimelineEntryDTO = components['schemas']['TimelineEntryDTO'];
|
|
|
|
const EV_A = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa';
|
|
const EV_B = 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb';
|
|
|
|
const makeEvent = (overrides: Partial<TimelineEntryDTO> = {}): TimelineEntryDTO =>
|
|
makeEntry({ kind: 'EVENT', type: 'PERSONAL', documentId: undefined, ...overrides });
|
|
|
|
describe('eventClustering — buildEventLookup', () => {
|
|
it('maps a curated year-band event to its title, excluding undated-bucket events (#7)', () => {
|
|
const timeline: TimelineDTO = {
|
|
years: [
|
|
{
|
|
year: 1916,
|
|
entries: [makeEvent({ eventId: EV_A, title: 'Ein gewaltiger Stadtbrand' })]
|
|
}
|
|
],
|
|
undated: [makeEvent({ eventId: EV_B, title: 'Briefe von der Front' })]
|
|
};
|
|
const lookup = buildEventLookup(timeline);
|
|
expect(lookup.get(EV_A)).toBe('Ein gewaltiger Stadtbrand');
|
|
// An undated event renders as a plain pill in the undated bucket — out of clustering
|
|
// scope. Including it here would scatter its dated letters into orphaned ✉ cross-year
|
|
// cards detached from the pill (#7), so it must NOT enter the lookup.
|
|
expect(lookup.has(EV_B)).toBe(false);
|
|
expect(lookup.size).toBe(1);
|
|
});
|
|
|
|
it('ignores derived events (no eventId) and letters', () => {
|
|
const timeline: TimelineDTO = {
|
|
years: [
|
|
{
|
|
year: 1916,
|
|
entries: [
|
|
makeEvent({ eventId: undefined, title: 'Geburt' }), // derived
|
|
makeEntry({ kind: 'LETTER', documentId: 'doc-1' })
|
|
]
|
|
}
|
|
],
|
|
undated: []
|
|
};
|
|
expect(buildEventLookup(timeline).size).toBe(0);
|
|
});
|
|
|
|
it('excludes a HISTORICAL event so its letters stay loose, keeping its WorldBand (REQ-014)', () => {
|
|
const timeline: TimelineDTO = {
|
|
years: [
|
|
{ year: 1916, entries: [makeEvent({ eventId: EV_A, type: 'HISTORICAL', title: 'Somme' })] }
|
|
],
|
|
undated: []
|
|
};
|
|
const lookup = buildEventLookup(timeline);
|
|
expect(lookup.has(EV_A)).toBe(false);
|
|
expect(lookup.size).toBe(0);
|
|
});
|
|
|
|
it('skips an event with an empty or whitespace title — no bare ✉ card (#8)', () => {
|
|
const timeline: TimelineDTO = {
|
|
years: [
|
|
{
|
|
year: 1916,
|
|
entries: [
|
|
makeEvent({ eventId: EV_A, title: '' }),
|
|
makeEvent({ eventId: EV_B, title: ' ' })
|
|
]
|
|
}
|
|
],
|
|
undated: []
|
|
};
|
|
expect(buildEventLookup(timeline).size).toBe(0);
|
|
});
|
|
});
|
|
|
|
describe('eventClustering — splitYearLetters', () => {
|
|
it('exposes a CLUSTER_PREVIEW of 5', () => {
|
|
expect(CLUSTER_PREVIEW).toBe(5);
|
|
});
|
|
|
|
it('clusters letters by linkedEventId with matching counts', () => {
|
|
const lookup = new Map([[EV_A, 'Stadtbrand']]);
|
|
const letters = [
|
|
makeEntry({ kind: 'LETTER', documentId: 'd1', linkedEventId: EV_A }),
|
|
makeEntry({ kind: 'LETTER', documentId: 'd2', linkedEventId: EV_A })
|
|
];
|
|
const { clusters, loose } = splitYearLetters(letters, lookup);
|
|
expect(clusters).toHaveLength(1);
|
|
expect(clusters[0].eventId).toBe(EV_A);
|
|
expect(clusters[0].title).toBe('Stadtbrand');
|
|
expect(clusters[0].letters).toHaveLength(2);
|
|
expect(loose).toHaveLength(0);
|
|
});
|
|
|
|
it('keeps a letter with no linkedEventId loose', () => {
|
|
const lookup = new Map([[EV_A, 'Stadtbrand']]);
|
|
const letters = [makeEntry({ kind: 'LETTER', documentId: 'd1', linkedEventId: undefined })];
|
|
const { clusters, loose } = splitYearLetters(letters, lookup);
|
|
expect(clusters).toHaveLength(0);
|
|
expect(loose).toHaveLength(1);
|
|
});
|
|
|
|
it('keeps a letter whose linkedEventId is absent from the lookup loose (filter-then-cluster, REQ-008)', () => {
|
|
const lookup = new Map([[EV_A, 'Stadtbrand']]);
|
|
const letters = [makeEntry({ kind: 'LETTER', documentId: 'd1', linkedEventId: EV_B })];
|
|
const { clusters, loose } = splitYearLetters(letters, lookup);
|
|
expect(clusters).toHaveLength(0);
|
|
expect(loose).toHaveLength(1);
|
|
});
|
|
|
|
it('places each letter in exactly one place (REQ-007)', () => {
|
|
const lookup = new Map([[EV_A, 'Stadtbrand']]);
|
|
const letters = [
|
|
makeEntry({ kind: 'LETTER', documentId: 'd1', linkedEventId: EV_A }),
|
|
makeEntry({ kind: 'LETTER', documentId: 'd2', linkedEventId: undefined }),
|
|
makeEntry({ kind: 'LETTER', documentId: 'd3', linkedEventId: EV_B })
|
|
];
|
|
const { clusters, loose } = splitYearLetters(letters, lookup);
|
|
const clustered = clusters.flatMap((c) => c.letters.length).reduce((a, b) => a + b, 0);
|
|
expect(clustered + loose.length).toBe(3);
|
|
expect(clustered).toBe(1);
|
|
expect(loose).toHaveLength(2);
|
|
});
|
|
|
|
it('keeps clusters in first-seen order', () => {
|
|
const lookup = new Map([
|
|
[EV_B, 'Front'],
|
|
[EV_A, 'Stadtbrand']
|
|
]);
|
|
const letters = [
|
|
makeEntry({ kind: 'LETTER', documentId: 'd1', linkedEventId: EV_A }),
|
|
makeEntry({ kind: 'LETTER', documentId: 'd2', linkedEventId: EV_B })
|
|
];
|
|
const { clusters } = splitYearLetters(letters, lookup);
|
|
expect(clusters.map((c) => c.eventId)).toEqual([EV_A, EV_B]);
|
|
});
|
|
});
|