moving removeByPageCommentDelete to service

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

@@ -30,7 +30,6 @@ export interface ActivityModel extends Model<ActivityDocument> {
   createByParameters(parameters: any): Promise<ActivityDocument>
   removeByParameters(parameters: any): any
   createByPageComment(comment: any): Promise<ActivityDocument>
-  removeByPageCommentDelete(comment: any): Promise<DeleteWriteOpResultObject['result']>
   createByPageLike(page: any, user: any): Promise<ActivityDocument>
   removeByPageUnlike(page: any, user: any): Promise<DeleteWriteOpResultObject['result']>
   removeByPage(page: any): Promise<DeleteWriteOpResultObject['result']>
@@ -115,25 +114,6 @@ activitySchema.statics.createByPageComment = function(comment) {
   return this.createByParameters(parameters);
 };
 
-/**
-   * @param {Comment} comment
-   * @return {Promise}
-   */
-activitySchema.statics.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,
-  };
-
-  await this.removeByParameters(parameters);
-
-  return;
-};
-
 /**
    * @param {Page} page
    * @param {User} user
@@ -168,6 +148,7 @@ activitySchema.statics.removeByPageUnlike = function(page, user) {
 
 /**
    * @param {Page} page
+   *
    * @return {Promise}
    */
 activitySchema.statics.removeByPage = async function(page) {

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

@@ -2,6 +2,8 @@ import loggerFactory from '../../utils/logger';
 
 import { Activity } from '~/server/models/activity';
 
+import ActivityDefine from '../util/activityDefine';
+
 const InAppNotificationService = require('./in-app-notification');
 
 
@@ -53,15 +55,32 @@ class ActivityService {
 
       try {
         // TODO: Able to remove child activities of comment by GW-7510
-        await Activity.removeByPageCommentDelete(comment);
+        await this.removeByPageCommentDelete(comment);
       }
       catch (err) {
         logger.error(err);
       }
     });
-
   }
 
+  /**
+   * @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,
+    };
+
+    await Activity.removeByParameters(parameters);
+    return;
+  };
+
 }
 
 module.exports = ActivityService;