merge(feat/person-birth-death-years): resolve conflicts with main, bump migration to V6

Resolves merge conflicts with main (feat/person-notes merged first).
Combines both features: birth/death years and notes field on person detail.
Renames migration V5__add_birth_death_years to V6 to avoid Flyway conflict.

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

backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java

@@ -59,7 +59,7 @@ public class PersonController {
                 ? 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"), birthYear, deathYear));
+        return ResponseEntity.ok(personService.updatePerson(id, firstName.trim(), lastName.trim(), body.get("alias"), body.get("notes"), birthYear, deathYear));
     }
 
     @PostMapping("/{id}/merge")

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

@@ -29,6 +29,10 @@ public class Person {
     // Optional: Aliasse für die Suche (z.B. "Opa Hans")
     private String alias;
 
+    // Optional: Free-text biographical notes
+    @Column(columnDefinition = "TEXT")
+    private String notes;
+
     private Integer birthYear;
     private Integer deathYear;
 }

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

@@ -58,7 +58,7 @@ public class PersonService {
     }
 
     @Transactional
-    public Person updatePerson(UUID id, String firstName, String lastName, String alias, Integer birthYear, Integer deathYear) {
+    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");
         }
@@ -67,6 +67,7 @@ public class PersonService {
         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);

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

@@ -0,0 +1 @@
+ALTER TABLE persons ADD COLUMN notes TEXT;

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

@@ -83,6 +83,32 @@ class PersonServiceTest {
         verify(personRepository).findByAliasIgnoreCase("Clara Cram");
     }
 
+    // ─── updatePerson (notes) ────────────────────────────────────────────────
+
+    @Test
+    void updatePerson_persistsNotes() {
+        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, "Some notes here.", null, null);
+
+        assertThat(result.getNotes()).isEqualTo("Some notes here.");
+    }
+
+    @Test
+    void updatePerson_clearsNotes_whenBlank() {
+        UUID id = UUID.randomUUID();
+        Person person = Person.builder().id(id).firstName("Anna").lastName("Alt").notes("old notes").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, null);
+
+        assertThat(result.getNotes()).isNull();
+    }
+
     // ─── updatePerson (birth/death years) ────────────────────────────────────
 
     @Test
@@ -92,7 +118,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, 1890, 1965);
+        Person result = personService.updatePerson(id, "Anna", "Alt", null, null, 1890, 1965);
 
         assertThat(result.getBirthYear()).isEqualTo(1890);
         assertThat(result.getDeathYear()).isEqualTo(1965);
@@ -102,7 +128,7 @@ class PersonServiceTest {
     void updatePerson_throwsBadRequest_whenBirthYearAfterDeathYear() {
         UUID id = UUID.randomUUID();
 
-        assertThatThrownBy(() -> personService.updatePerson(id, "Anna", "Alt", null, 1970, 1950))
+        assertThatThrownBy(() -> personService.updatePerson(id, "Anna", "Alt", null, null, 1970, 1950))
                 .isInstanceOf(ResponseStatusException.class)
                 .extracting(e -> ((ResponseStatusException) e).getStatusCode().value())
                 .isEqualTo(400);
@@ -115,7 +141,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, 1900, 1900);
+        Person result = personService.updatePerson(id, "Anna", "Alt", null, null, 1900, 1900);
 
         assertThat(result.getBirthYear()).isEqualTo(1900);
         assertThat(result.getDeathYear()).isEqualTo(1900);