kaori 4 سال پیش
والد
کامیت
32f5df2523
1فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 7 5
      packages/app/src/server/models/activity.ts

+ 7 - 5
packages/app/src/server/models/activity.ts

@@ -9,9 +9,11 @@ import ActivityDefine from '../util/activityDefine';
 
 
 import Watcher from './watcher';
 import Watcher from './watcher';
 import { InAppNotification } from './in-app-notification';
 import { InAppNotification } from './in-app-notification';
-import InAppNotificationService from '../service/in-app-notification';
+
 import ActivityEvent from '../events/activity';
 import ActivityEvent from '../events/activity';
 
 
+const InAppNotificationService = require('../service/in-app-notification');
+
 const logger = loggerFactory('growi:models:activity');
 const logger = loggerFactory('growi:models:activity');
 
 
 export interface ActivityDocument extends Document {
 export interface ActivityDocument extends Document {
@@ -38,8 +40,6 @@ export interface ActivityModel extends Model<ActivityDocument> {
   getActionUsersFromActivities(activities: ActivityDocument[]): any[]
   getActionUsersFromActivities(activities: ActivityDocument[]): any[]
 }
 }
 
 
-// const activityEvent = crowi.event('Activity');
-
 // TODO: add revision id
 // TODO: add revision id
 const activitySchema = new Schema<ActivityDocument, ActivityModel>({
 const activitySchema = new Schema<ActivityDocument, ActivityModel>({
   user: {
   user: {
@@ -223,11 +223,13 @@ activitySchema.post('save', async(savedActivity: ActivityDocument) => {
 // because mongoose's 'remove' hook fired only when remove by a method of Document (not by a Model method)
 // because mongoose's 'remove' hook fired only when remove by a method of Document (not by a Model method)
 // move 'save' hook from mongoose's events to activityEvent if I have a time.
 // move 'save' hook from mongoose's events to activityEvent if I have a time.
 const activityEvent = new ActivityEvent();
 const activityEvent = new ActivityEvent();
+
+// const inAppNotificationService = new InAppNotificationService(crowi);
+
 activityEvent.on('remove', async(activity: ActivityDocument) => {
 activityEvent.on('remove', async(activity: ActivityDocument) => {
-  const inAppNotificationService = new InAppNotificationService();
 
 
   try {
   try {
-    await inAppNotificationService.removeActivity(activity);
+    // await inAppNotificationService.removeActivity(activity);
   }
   }
   catch (err) {
   catch (err) {
     logger.error(err);
     logger.error(err);