using activityEvent in activity service not the model

packages/app/src/server/models/activity.ts

@@ -4,13 +4,11 @@ import {
 import Crowi from '../crowi';
 
 import { getOrCreateModel, getModelSafely } from '../util/mongoose-utils';
-import loggerFactory from '../../utils/logger';
+
 import ActivityDefine from '../util/activityDefine';
 
 import Subscription from './subscription';
 
-const logger = loggerFactory('growi:models:activity');
-
 
 export interface ActivityDocument extends Document {
   _id: Types.ObjectId
@@ -28,7 +26,6 @@ export interface ActivityDocument extends Document {
 export type ActivityModel = Model<ActivityDocument>
 
 module.exports = function(crowi: Crowi) {
-  const activityEvent = crowi.event('activity');
 
   // TODO: add revision id
   const activitySchema = new Schema<ActivityDocument, ActivityModel>({
@@ -96,18 +93,6 @@ module.exports = function(crowi: Crowi) {
     return activeNotificationUsers;
   };
 
-  activitySchema.post('save', async(savedActivity: ActivityDocument) => {
-    let targetUsers: Types.ObjectId[] = [];
-    try {
-      targetUsers = await savedActivity.getNotificationTargetUsers();
-    }
-    catch (err) {
-      logger.error(err);
-    }
-
-    activityEvent.emit('create', targetUsers, savedActivity);
-  });
-
   return getOrCreateModel<ActivityDocument, ActivityModel>('Activity', activitySchema);
 
 };

packages/app/src/server/service/activity.ts

@@ -1,7 +1,14 @@
+import {
+  Types,
+} from 'mongoose';
 import Crowi from '../crowi';
 
+
 import { getModelSafely } from '../util/mongoose-utils';
 
+import loggerFactory from '../../utils/logger';
+
+const logger = loggerFactory('growi:service:activity');
 
 class ActivityService {
 
@@ -22,9 +29,21 @@ class ActivityService {
      * @param {object} parameters
      * @return {Promise}
      */
-  createByParameters = function(parameters) {
+  createByParameters = async function(parameters) {
     const Activity = getModelSafely('Activity') || require('../models/activity')(this.crowi);
-    return Activity.create(parameters);
+    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;
   };