Shun Miyazawa 3 лет назад
Родитель
Сommit
49b6b83756
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      packages/app/src/server/service/comment.ts
  2. 2 2
      packages/app/src/server/service/page.ts

+ 2 - 2
packages/app/src/server/service/comment.ts

@@ -2,7 +2,7 @@ import { getModelSafely } from '@growi/core';
 import { Types } from 'mongoose';
 import { Types } from 'mongoose';
 
 
 import { SUPPORTED_TARGET_MODEL_TYPE, SUPPORTED_ACTION_TYPE, ISnapshot } from '~/interfaces/activity';
 import { SUPPORTED_TARGET_MODEL_TYPE, SUPPORTED_ACTION_TYPE, ISnapshot } from '~/interfaces/activity';
-import { stringifySnapshot as stringifySnapshotForInAppNotification } from '~/models/serializers/in-app-notification-snapshot/page';
+import { stringifySnapshot } from '~/models/serializers/in-app-notification-snapshot/page';
 
 
 import loggerFactory from '../../utils/logger';
 import loggerFactory from '../../utils/logger';
 import Crowi from '../crowi';
 import Crowi from '../crowi';
@@ -99,7 +99,7 @@ class CommentService {
     targetUsers = await activity.getNotificationTargetUsers();
     targetUsers = await activity.getNotificationTargetUsers();
 
 
     // Create and send notifications
     // Create and send notifications
-    const snapshot = stringifySnapshotForInAppNotification(page);
+    const snapshot = stringifySnapshot(page);
     await this.inAppNotificationService.upsertByActivity(targetUsers, activity, snapshot);
     await this.inAppNotificationService.upsertByActivity(targetUsers, activity, snapshot);
     await this.inAppNotificationService.emitSocketIo(targetUsers);
     await this.inAppNotificationService.emitSocketIo(targetUsers);
   };
   };

+ 2 - 2
packages/app/src/server/service/page.ts

@@ -18,7 +18,7 @@ import {
 } from '~/interfaces/page-delete-config';
 } from '~/interfaces/page-delete-config';
 import { IUserHasId } from '~/interfaces/user';
 import { IUserHasId } from '~/interfaces/user';
 import { PageMigrationErrorData, SocketEventName, UpdateDescCountRawData } from '~/interfaces/websocket';
 import { PageMigrationErrorData, SocketEventName, UpdateDescCountRawData } from '~/interfaces/websocket';
-import { stringifySnapshot as stringifySnapshotForInAppNotification } from '~/models/serializers/in-app-notification-snapshot/page';
+import { stringifySnapshot } from '~/models/serializers/in-app-notification-snapshot/page';
 import {
 import {
   CreateMethod, PageCreateOptions, PageModel, PageDocument,
   CreateMethod, PageCreateOptions, PageModel, PageDocument,
 } from '~/server/models/page';
 } from '~/server/models/page';
@@ -2249,7 +2249,7 @@ class PageService {
     const targetUsers = await activity.getNotificationTargetUsers();
     const targetUsers = await activity.getNotificationTargetUsers();
 
 
     // Create and send notifications
     // Create and send notifications
-    const snapshotForInAppNotification = stringifySnapshotForInAppNotification(target);
+    const snapshotForInAppNotification = stringifySnapshot(target);
     await inAppNotificationService.upsertByActivity(targetUsers, activity, snapshotForInAppNotification);
     await inAppNotificationService.upsertByActivity(targetUsers, activity, snapshotForInAppNotification);
     await inAppNotificationService.emitSocketIo(targetUsers);
     await inAppNotificationService.emitSocketIo(targetUsers);
   }
   }