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

Merge pull request #4329 from weseek/imprv/gw7228-create-activity-document

Imprv/gw7228 saving activity document when a comment created
Yuki Takei 4 лет назад
Родитель
Сommit
c30ecfa532

+ 2 - 2
packages/app/src/server/models/activity.ts

@@ -196,11 +196,11 @@ activitySchema.methods.getNotificationTargetUsers = async function() {
 };
 
 /**
-   * saved hook
+   * saved hook   TODO: getNotificationTargetUsers by GW-7346
    */
 activitySchema.post('save', async(savedActivity: ActivityDocument) => {
   try {
-    const notificationUsers = await savedActivity.getNotificationTargetUsers();
+    // const notificationUsers = await savedActivity.getNotificationTargetUsers();
 
     // await Promise.all(notificationUsers.map(user => InAppNotification.upsertByActivity(user, savedActivity)));
     return;

+ 8 - 1
packages/app/src/server/models/comment.js

@@ -1,5 +1,6 @@
 // disable no-return-await for model functions
 /* eslint-disable no-return-await */
+import { Activity } from './activity';
 
 module.exports = function(crowi) {
   const debug = require('debug')('growi:models:comment');
@@ -116,8 +117,14 @@ module.exports = function(crowi) {
       throw err;
     }
 
-
     await commentEvent.emit('create', savedComment.creator);
+    try {
+      const activityLog = await Activity.createByPageComment(savedComment);
+      debug('Activity created', activityLog);
+    }
+    catch (err) {
+      throw err;
+    }
   });
 
   return mongoose.model('Comment', commentSchema);