fix

apps/server/src/core/notification/notification.constants.ts

@@ -9,3 +9,10 @@ export const NotificationType = {
 
 export type NotificationType =
   (typeof NotificationType)[keyof typeof NotificationType];
+
+export type NotificationSettingKey =
+  | 'page.updated'
+  | 'page.user_mention'
+  | 'comment.user_mention'
+  | 'comment.created'
+  | 'comment.resolved';

apps/server/src/core/user/user.service.ts

@@ -7,6 +7,7 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { UpdateUserDto } from './dto/update-user.dto';
+import { NotificationSettingKey } from '../notification/notification.constants';
 import { comparePasswordHash, diffAuditTrackedFields } from 'src/common/helpers/utils';
 import { Workspace } from '@docmost/db/types/entity.types';
 import { validateSsoEnforcement } from '../auth/auth.util';
@@ -60,7 +61,7 @@ export class UserService {
       );
     }
 
-    const notificationSettings: Record<string, string> = {
+    const notificationSettings: Record<string, NotificationSettingKey> = {
       notificationPageUpdates: 'page.updated',
       notificationPageUserMention: 'page.user_mention',
       notificationCommentUserMention: 'comment.user_mention',
@@ -72,7 +73,7 @@ export class UserService {
       if (typeof updateUserDto[dtoField] !== 'undefined') {
         return this.userRepo.updateNotificationSetting(
           userId,
-          settingKey as any,
+          settingKey,
           updateUserDto[dtoField],
         );
       }

apps/server/src/database/repos/user/user.repo.ts

@@ -13,6 +13,7 @@ import { PaginationOptions } from '../../pagination/pagination-options';
 import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
 import { ExpressionBuilder, sql } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { NotificationSettingKey } from '../../../core/notification/notification.constants';
 
 @Injectable()
 export class UserRepo {
@@ -193,7 +194,7 @@ export class UserRepo {
 
   async updateNotificationSetting(
     userId: string,
-    settingKey: 'page.updated' | 'page.user_mention' | 'comment.user_mention' | 'comment.created' | 'comment.resolved',
+    settingKey: NotificationSettingKey,
     settingValue: boolean,
   ) {
     return await this.db
@@ -201,7 +202,7 @@ export class UserRepo {
       .set({
         settings: sql`COALESCE(settings, '{}'::jsonb)
                 || jsonb_build_object('notifications', COALESCE(settings->'notifications', '{}'::jsonb)
-                || jsonb_build_object(${settingKey}, ${sql.lit(settingValue)}))`,
+                || jsonb_build_object(${sql.lit(settingKey)}, ${sql.lit(settingValue)}))`,
         updatedAt: new Date(),
       })
       .where('id', '=', userId)