Merge pull request #4426 from weseek/fix/#78067-remain-activity-even-if-coment-deleted

remain activity even if comment deleted

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

@@ -44,25 +44,6 @@ class ActivityService {
     });
   }
 
-  /**
-   * @param {Comment} comment
-   * @return {Promise}
-   */
-  removeByPageCommentDelete = async function(comment) {
-    const parameters = await {
-      user: comment.creator,
-      targetModel: ActivityDefine.MODEL_PAGE,
-      target: comment.page,
-      eventModel: ActivityDefine.MODEL_COMMENT,
-      event: comment._id,
-      action: ActivityDefine.ACTION_COMMENT,
-    };
-
-    const Activity = getModelSafely('Activity') || require('../models/activity')(this.crowi);
-    await Activity.removeByParameters(parameters);
-    return;
-  };
-
   /**
    * @param {Page} page
    * @param {User} user

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

@@ -52,8 +52,6 @@ class CommentService {
     this.commentEvent.on('remove', async(comment) => {
       this.commentEvent.onRemove();
 
-      const { activityService } = this.crowi;
-
       try {
         const Page = getModelSafely('Page') || require('../models/page')(this.crowi);
         await Page.updateCommentCount(comment.page);
@@ -61,14 +59,6 @@ class CommentService {
       catch (err) {
         logger.error('Error occurred while updating the comment count:\n', err);
       }
-
-      try {
-        // TODO: Able to remove child activities of comment by GW-7510
-        await activityService.removeByPageCommentDelete(comment);
-      }
-      catch (err) {
-        logger.error(err);
-      }
     });
   }