diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java b/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java
index a32bfbfb..4db84bde 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java
@@ -55,7 +55,11 @@ public class PersonController {
if (firstName == null || firstName.isBlank() || lastName == null || lastName.isBlank()) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Vor- und Nachname sind Pflichtfelder");
}
- return ResponseEntity.ok(personService.updatePerson(id, firstName.trim(), lastName.trim(), body.get("alias"), body.get("notes")));
+ Integer birthYear = body.get("birthYear") != null && !body.get("birthYear").isBlank()
+ ? Integer.parseInt(body.get("birthYear")) : null;
+ Integer deathYear = body.get("deathYear") != null && !body.get("deathYear").isBlank()
+ ? Integer.parseInt(body.get("deathYear")) : null;
+ return ResponseEntity.ok(personService.updatePerson(id, firstName.trim(), lastName.trim(), body.get("alias"), body.get("notes"), birthYear, deathYear));
}
@PostMapping("/{id}/merge")
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java b/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
index fbad2f5e..ce2595b5 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/model/Person.java
@@ -32,4 +32,7 @@ public class Person {
// Optional: Free-text biographical notes
@Column(columnDefinition = "TEXT")
private String notes;
+
+ private Integer birthYear;
+ private Integer deathYear;
}
\ No newline at end of file
diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java
index 98e3f067..ae555086 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java
@@ -58,13 +58,18 @@ public class PersonService {
}
@Transactional
- public Person updatePerson(UUID id, String firstName, String lastName, String alias, String notes) {
+ public Person updatePerson(UUID id, String firstName, String lastName, String alias, String notes, Integer birthYear, Integer deathYear) {
+ if (birthYear != null && deathYear != null && birthYear > deathYear) {
+ throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Geburtsjahr darf nicht nach dem Todesjahr liegen");
+ }
Person person = personRepository.findById(id)
.orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Person nicht gefunden"));
person.setFirstName(firstName);
person.setLastName(lastName);
person.setAlias(alias == null || alias.isBlank() ? null : alias.trim());
person.setNotes(notes == null || notes.isBlank() ? null : notes.trim());
+ person.setBirthYear(birthYear);
+ person.setDeathYear(deathYear);
return personRepository.save(person);
}
diff --git a/backend/src/main/resources/db/migration/V6__add_birth_death_years_to_persons.sql b/backend/src/main/resources/db/migration/V6__add_birth_death_years_to_persons.sql
new file mode 100644
index 00000000..31875721
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V6__add_birth_death_years_to_persons.sql
@@ -0,0 +1,2 @@
+ALTER TABLE persons ADD COLUMN birth_year INTEGER;
+ALTER TABLE persons ADD COLUMN death_year INTEGER;
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java
index 532d6e12..654df2ef 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonServiceTest.java
@@ -92,7 +92,7 @@ class PersonServiceTest {
when(personRepository.findById(id)).thenReturn(Optional.of(person));
when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
- Person result = personService.updatePerson(id, "Anna", "Alt", null, "Some notes here.");
+ Person result = personService.updatePerson(id, "Anna", "Alt", null, "Some notes here.", null, null);
assertThat(result.getNotes()).isEqualTo("Some notes here.");
}
@@ -104,11 +104,49 @@ class PersonServiceTest {
when(personRepository.findById(id)).thenReturn(Optional.of(person));
when(personRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
- Person result = personService.updatePerson(id, "Anna", "Alt", null, " ");
+ Person result = personService.updatePerson(id, "Anna", "Alt", null, " ", null, null);
assertThat(result.getNotes()).isNull();
}
+ // ─── updatePerson (birth/death years) ────────────────────────────────────
+
+ @Test
+ 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));
+
+ Person result = personService.updatePerson(id, "Anna", "Alt", null, null, 1890, 1965);
+
+ assertThat(result.getBirthYear()).isEqualTo(1890);
+ assertThat(result.getDeathYear()).isEqualTo(1965);
+ }
+
+ @Test
+ void updatePerson_throwsBadRequest_whenBirthYearAfterDeathYear() {
+ UUID id = UUID.randomUUID();
+
+ assertThatThrownBy(() -> personService.updatePerson(id, "Anna", "Alt", null, null, 1970, 1950))
+ .isInstanceOf(ResponseStatusException.class)
+ .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
+ .isEqualTo(400);
+ }
+
+ @Test
+ 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));
+
+ Person result = personService.updatePerson(id, "Anna", "Alt", null, null, 1900, 1900);
+
+ assertThat(result.getBirthYear()).isEqualTo(1900);
+ assertThat(result.getDeathYear()).isEqualTo(1900);
+ }
+
// ─── mergePersons ─────────────────────────────────────────────────────────
@Test
diff --git a/frontend/e2e/persons.spec.ts b/frontend/e2e/persons.spec.ts
index 78e43c27..87701eb8 100644
--- a/frontend/e2e/persons.spec.ts
+++ b/frontend/e2e/persons.spec.ts
@@ -52,6 +52,28 @@ test.describe('Person detail', () => {
await expect(page.getByLabel('Vorname')).not.toBeVisible();
}
});
+
+ test('birth and death year fields appear in edit mode and save correctly', async ({ page }) => {
+ await page.goto('/persons');
+ const firstPerson = page.locator('a[href^="/persons/"]').first();
+ await firstPerson.click();
+
+ const editBtn = page.getByRole('button', { name: /Bearbeiten/i });
+ await editBtn.click();
+
+ await expect(page.getByLabel(/Geburtsjahr/i)).toBeVisible();
+ await expect(page.getByLabel(/Todesjahr/i)).toBeVisible();
+
+ await page.getByLabel(/Geburtsjahr/i).fill('1890');
+ await page.getByLabel(/Todesjahr/i).fill('1965');
+
+ await page.getByRole('button', { name: /Speichern/i }).click();
+
+ // After saving, the years should be shown in view mode
+ await expect(page.getByText('* 1890')).toBeVisible();
+ await expect(page.getByText('† 1965')).toBeVisible();
+ await page.screenshot({ path: 'test-results/e2e/person-birth-death-years.png' });
+ });
});
test.describe('New person', () => {
diff --git a/frontend/messages/de.json b/frontend/messages/de.json
index cf123bbe..fec2ab78 100644
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -113,6 +113,11 @@
"person_merge_warning": "Achtung: Diese Aktion ist nicht rückgängig zu machen.",
"person_label_notes": "Notizen",
"person_placeholder_notes": "Biographische Hinweise, Besonderheiten…",
+ "person_label_birth_year": "Geburtsjahr",
+ "person_label_death_year": "Todesjahr",
+ "person_placeholder_year": "z.B. 1923",
+ "person_year_error": "Bitte eine vierstellige Jahreszahl eingeben",
+ "person_years_error_order": "Geburtsjahr muss vor dem Todesjahr liegen",
"person_docs_heading": "Gesendete Dokumente",
"person_no_docs": "Diese Person ist noch nicht als Absender verknüpft.",
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 150397ec..ea7937aa 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -113,6 +113,11 @@
"person_merge_warning": "Warning: This action cannot be undone.",
"person_label_notes": "Notes",
"person_placeholder_notes": "Biographical notes, remarks…",
+ "person_label_birth_year": "Birth year",
+ "person_label_death_year": "Death year",
+ "person_placeholder_year": "e.g. 1923",
+ "person_year_error": "Please enter a four-digit year",
+ "person_years_error_order": "Birth year must be before death year",
"person_docs_heading": "Sent documents",
"person_no_docs": "This person has not yet been linked as a sender.",
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
index b947cca4..8e3dd5cc 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -113,6 +113,11 @@
"person_merge_warning": "Atención: Esta acción no se puede deshacer.",
"person_label_notes": "Notas",
"person_placeholder_notes": "Notas biográficas, observaciones…",
+ "person_label_birth_year": "Año de nacimiento",
+ "person_label_death_year": "Año de fallecimiento",
+ "person_placeholder_year": "p.ej. 1923",
+ "person_year_error": "Introduzca un año de cuatro dígitos",
+ "person_years_error_order": "El año de nacimiento debe ser anterior al año de fallecimiento",
"person_docs_heading": "Documentos enviados",
"person_no_docs": "Esta persona aún no está vinculada como remitente.",
diff --git a/frontend/src/lib/generated/api.ts b/frontend/src/lib/generated/api.ts
index e009bac5..b0eedc49 100644
--- a/frontend/src/lib/generated/api.ts
+++ b/frontend/src/lib/generated/api.ts
@@ -308,6 +308,8 @@ export interface components {
lastName: string;
alias?: string;
notes?: string;
+ birthYear?: number;
+ deathYear?: number;
};
DocumentUpdateDTO: {
title?: string;
diff --git a/frontend/src/routes/persons/[id]/+page.server.ts b/frontend/src/routes/persons/[id]/+page.server.ts
index bd5d803b..1dc07294 100644
--- a/frontend/src/routes/persons/[id]/+page.server.ts
+++ b/frontend/src/routes/persons/[id]/+page.server.ts
@@ -29,6 +29,8 @@ export const actions = {
const lastName = formData.get('lastName')?.toString().trim();
const alias = formData.get('alias')?.toString().trim() || undefined;
const notes = formData.get('notes')?.toString().trim() || undefined;
+ const birthYear = formData.get('birthYear')?.toString().trim() || undefined;
+ const deathYear = formData.get('deathYear')?.toString().trim() || undefined;
if (!firstName || !lastName) {
return fail(400, { updateError: 'Vor- und Nachname sind Pflichtfelder.' });
@@ -37,7 +39,13 @@ export const actions = {
const api = createApiClient(fetch);
const { error: apiError } = await api.PUT('/api/persons/{id}', {
params: { path: { id: params.id } },
- body: { firstName, lastName, ...(alias ? { alias } : {}), ...(notes ? { notes } : {}) }
+ body: {
+ firstName, lastName,
+ ...(alias ? { alias } : {}),
+ ...(notes ? { notes } : {}),
+ ...(birthYear ? { birthYear } : {}),
+ ...(deathYear ? { deathYear } : {})
+ }
});
if (apiError) {
diff --git a/frontend/src/routes/persons/[id]/+page.svelte b/frontend/src/routes/persons/[id]/+page.svelte
index 9cbd0e6b..605c848b 100644
--- a/frontend/src/routes/persons/[id]/+page.svelte
+++ b/frontend/src/routes/persons/[id]/+page.svelte
@@ -86,6 +86,32 @@
class="block w-full border border-gray-300 rounded px-3 py-2 font-serif text-brand-navy focus:outline-none focus:border-brand-navy"
/>
+
+
+
+
+
+
+
+