Просмотр исходного кода

Revert "create "createActivity""

This reverts commit f2add41eec8332aaf2bbaf6d3baad9458fa2859d.
Shun Miyazawa 4 лет назад
Родитель
Сommit
b85b7eef23
2 измененных файлов с 5 добавлено и 14 удалено
  1. 0 2
      packages/app/src/interfaces/activity.ts
  2. 5 12
      packages/app/src/server/service/page.ts

+ 0 - 2
packages/app/src/interfaces/activity.ts

@@ -5,7 +5,6 @@ const MODEL_COMMENT = 'Comment';
 // Action
 const ACTION_PAGE_LIKE = 'PAGE_LIKE';
 const ACTION_PAGE_BOOKMARK = 'PAGE_BOOKMARK';
-const ACTION_PAGE_CREATE = 'PAGE_CREATE';
 const ACTION_PAGE_UPDATE = 'PAGE_UPDATE';
 const ACTION_PAGE_RENAME = 'PAGE_RENAME';
 const ACTION_PAGE_DUPLICATE = 'PAGE_DUPLICATE';
@@ -27,7 +26,6 @@ export const SUPPORTED_EVENT_MODEL_TYPE = {
 export const SUPPORTED_ACTION_TYPE = {
   ACTION_PAGE_LIKE,
   ACTION_PAGE_BOOKMARK,
-  ACTION_PAGE_CREATE,
   ACTION_PAGE_UPDATE,
   ACTION_PAGE_RENAME,
   ACTION_PAGE_DUPLICATE,

+ 5 - 12
packages/app/src/server/service/page.ts

@@ -18,7 +18,6 @@ import {
 import { IUserHasId } from '~/interfaces/user';
 import { SocketEventName, UpdateDescCountRawData } from '~/interfaces/websocket';
 import { stringifySnapshot } from '~/models/serializers/in-app-notification-snapshot/page';
-import { ActivityDocument } from '~/server/models/activity';
 import {
   CreateMethod, PageCreateOptions, PageModel, PageDocument,
 } from '~/server/models/page';
@@ -2230,9 +2229,12 @@ class PageService {
     return shortBodiesMap;
   }
 
-  private async createActivity(page, user, action) {
-    const { activityService } = this.crowi;
+  private async createAndSendNotifications(page, user, action) {
+    const { activityService, inAppNotificationService } = this.crowi;
+
+    const snapshot = stringifySnapshot(page);
 
+    // Create activity
     const parameters = {
       user: user._id,
       targetModel: SUPPORTED_TARGET_MODEL_TYPE.MODEL_PAGE,
@@ -2241,19 +2243,10 @@ class PageService {
     };
     const activity = await activityService.createByParameters(parameters);
 
-    return activity;
-  }
-
-  private async createAndSendNotifications(page, user, action) {
-    const { inAppNotificationService } = this.crowi;
-
-    const activity = (this.createActivity(page, user, action) as any) as ActivityDocument;
-
     // Get user to be notified
     const targetUsers = await activity.getNotificationTargetUsers();
 
     // Create and send notifications
-    const snapshot = stringifySnapshot(page);
     await inAppNotificationService.upsertByActivity(targetUsers, activity, snapshot);
     await inAppNotificationService.emitSocketIo(targetUsers);
   }