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

@@ -19,7 +19,6 @@ import java.util.UUID;
 
 @RestController
 @RequiredArgsConstructor
-@RequirePermission(Permission.READ_ALL)
 public class NotificationController {
 
     private final NotificationService notificationService;

backend/src/main/java/org/raddatz/familienarchiv/dto/NotificationDTO.java

@@ -10,6 +10,7 @@ public record NotificationDTO(
         NotificationType type,
         UUID documentId,
         UUID referenceId,
+        UUID annotationId,
         boolean read,
         LocalDateTime createdAt,
         String actorName

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

@@ -37,6 +37,9 @@ public class Notification {
     @Column(name = "reference_id")
     private UUID referenceId;
 
+    @Column(name = "annotation_id")
+    private UUID annotationId;
+
     @Column(nullable = false)
     @Builder.Default
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED)

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

@@ -55,6 +55,7 @@ public class NotificationService {
                     .type(NotificationType.REPLY)
                     .documentId(reply.getDocumentId())
                     .referenceId(reply.getId())
+                    .annotationId(reply.getAnnotationId())
                     .actorName(reply.getAuthorName())
                     .build();
             notificationRepository.save(notification);
@@ -80,6 +81,7 @@ public class NotificationService {
                     .type(NotificationType.MENTION)
                     .documentId(comment.getDocumentId())
                     .referenceId(comment.getId())
+                    .annotationId(comment.getAnnotationId())
                     .actorName(comment.getAuthorName())
                     .build();
             notificationRepository.save(notification);
@@ -129,6 +131,7 @@ public class NotificationService {
                 n.getType(),
                 n.getDocumentId(),
                 n.getReferenceId(),
+                n.getAnnotationId(),
                 n.isRead(),
                 n.getCreatedAt(),
                 n.getActorName()

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

@@ -0,0 +1 @@
+ALTER TABLE notifications ADD COLUMN annotation_id UUID;

backend/src/test/java/org/raddatz/familienarchiv/controller/NotificationControllerTest.java

@@ -53,9 +53,14 @@ class NotificationControllerTest {
 
     @Test
     @WithMockUser(username = "testuser")
-    void getNotifications_returns403_whenUserLacksPermission() throws Exception {
+    void getNotifications_returns200_whenAuthenticatedWithNoPermissions() throws Exception {
+        AppUser user = AppUser.builder().id(USER_ID).username("testuser").build();
+        when(userService.findByUsername("testuser")).thenReturn(user);
+        when(notificationService.getNotifications(eq(USER_ID), any()))
+                .thenReturn(new PageImpl<>(List.of()));
+
         mockMvc.perform(get("/api/notifications"))
-                .andExpect(status().isForbidden());
+                .andExpect(status().isOk());
     }
 
     @Test
@@ -64,7 +69,7 @@ class NotificationControllerTest {
         AppUser user = AppUser.builder().id(USER_ID).username("testuser").build();
         NotificationDTO dto = new NotificationDTO(
                 UUID.randomUUID(), NotificationType.REPLY, UUID.randomUUID(),
-                UUID.randomUUID(), false, LocalDateTime.now(), "Anna Smith");
+                UUID.randomUUID(), null, false, LocalDateTime.now(), "Anna Smith");
 
         when(userService.findByUsername("testuser")).thenReturn(user);
         when(notificationService.getNotifications(eq(USER_ID), any()))
@@ -185,9 +190,14 @@ class NotificationControllerTest {
 
     @Test
     @WithMockUser(username = "testuser", authorities = {"WRITE_ALL"})
-    void getNotifications_returns403_whenUserHasOnlyWriteAll() throws Exception {
+    void getNotifications_returns200_whenUserHasOnlyWriteAll() throws Exception {
+        AppUser user = AppUser.builder().id(USER_ID).username("testuser").build();
+        when(userService.findByUsername("testuser")).thenReturn(user);
+        when(notificationService.getNotifications(eq(USER_ID), any()))
+                .thenReturn(new PageImpl<>(List.of()));
+
         mockMvc.perform(get("/api/notifications"))
-                .andExpect(status().isForbidden());
+                .andExpect(status().isOk());
     }
 
     // ─── PUT /api/users/me/notification-preferences ──────────────────────────

frontend/src/routes/profile/+page.svelte

@@ -1,14 +1,14 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
-import { untrack } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
 import PersonalInfoForm from './PersonalInfoForm.svelte';
 import PasswordChangeForm from './PasswordChangeForm.svelte';
 
 let { data, form } = $props();
 
-let notifyOnReply = $state(untrack(() => data.notificationPrefs?.notifyOnReply ?? false));
+let notifyOnReply = $derived(data.notificationPrefs?.notifyOnReply ?? false);
-let notifyOnMention = $state(untrack(() => data.notificationPrefs?.notifyOnMention ?? false));
+let notifyOnMention = $derived(data.notificationPrefs?.notifyOnMention ?? false);
+const hasEmail = $derived(!!data.user?.email);
 </script>
 
 <div class="mx-auto max-w-7xl px-4 py-8 sm:px-6 lg:px-8">
@@ -53,32 +53,49 @@ let notifyOnMention = $state(untrack(() => data.notificationPrefs?.notifyOnMenti
 			</div>
 		{/if}
 
-		<form method="POST" action="?/updateNotificationPrefs" use:enhance>
+		<form
+			method="POST"
+			action="?/updateNotificationPrefs"
+			use:enhance={() => async ({ update }) => update({ reset: false })}
+		>
 			<div class="space-y-4">
-				<label class="flex cursor-pointer items-start gap-3">
+				<label
+					class="flex items-start gap-3 {hasEmail ? 'cursor-pointer' : 'cursor-not-allowed opacity-40'}"
+				>
 					<input
 						type="checkbox"
 						name="notifyOnReply"
 						bind:checked={notifyOnReply}
+						disabled={!hasEmail}
 						class="mt-0.5 h-4 w-4 rounded border-line accent-primary"
 					/>
 					<span class="text-sm text-ink">{m.notification_pref_reply()}</span>
 				</label>
 
-				<label class="flex cursor-pointer items-start gap-3">
+				<label
+					class="flex items-start gap-3 {hasEmail ? 'cursor-pointer' : 'cursor-not-allowed opacity-40'}"
+				>
 					<input
 						type="checkbox"
 						name="notifyOnMention"
 						bind:checked={notifyOnMention}
+						disabled={!hasEmail}
 						class="mt-0.5 h-4 w-4 rounded border-line accent-primary"
 					/>
 					<span class="text-sm text-ink">{m.notification_pref_mention()}</span>
 				</label>
 			</div>
 
+			{#if !hasEmail}
+				<p class="mt-3 text-xs text-ink-3">
+					{m.notification_prefs_no_email()}
+				</p>
+			{/if}
+
 			<button
 				type="submit"
-				class="mt-5 rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
+				disabled={!hasEmail}
+				class="mt-5 rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity {hasEmail ? 'hover:opacity-80' : 'cursor-not-allowed opacity-40'}"
 			>
 				{m.btn_save()}
 			</button>