kaori 4 лет назад
Родитель
Сommit
1b6ca0302c

+ 1 - 12
packages/app/src/server/service/activity.ts

@@ -31,19 +31,8 @@ class ActivityService {
      */
   createByParameters = async function(parameters) {
     const Activity = getModelSafely('Activity') || require('../models/activity')(this.crowi);
-    const savedActivity = Activity.create(parameters);
 
-    let targetUsers: Types.ObjectId[] = [];
-    try {
-      targetUsers = await savedActivity.getNotificationTargetUsers();
-    }
-    catch (err) {
-      logger.error(err);
-    }
-
-    this.activityEvent.emit('create', targetUsers, savedActivity);
-
-    return savedActivity;
+    return Activity.create(parameters);
   };
 
 

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

@@ -42,6 +42,8 @@ class CommentService {
         let targetUsers: Types.ObjectId[] = [];
         targetUsers = await savedActivity.getNotificationTargetUsers();
 
+        this.activityEvent.emit('create', targetUsers, savedActivity);
+
         await this.inAppNotificationService.upsertByActivity(targetUsers, savedActivity);
       }
       catch (err) {

+ 3 - 0
packages/app/src/server/service/page.js

@@ -22,6 +22,7 @@ class PageService {
   constructor(crowi) {
     this.crowi = crowi;
     this.pageEvent = crowi.event('page');
+    this.activityEvent = crowi.event('activity');
 
     // init
     this.initPageEvent();
@@ -42,6 +43,8 @@ class PageService {
         let targetUsers = [];
         targetUsers = await savedActivity.getNotificationTargetUsers();
 
+        this.activityEvent.emit('create', targetUsers, savedActivity);
+
         await inAppNotificationService.upsertByActivity(targetUsers, savedActivity);
       }
       catch (err) {